[dracut/f16] dracut-013-22
Harald Hoyer
harald at fedoraproject.org
Mon Mar 26 10:46:32 UTC 2012
commit 7295788a0e4d168bf337f35d2df6fe6753d1f565
Author: Harald Hoyer <harald at redhat.com>
Date: Mon Mar 26 12:45:32 2012 +0200
dracut-013-22
- added convertfs dracut module
- added mdraid --offroot support
...live-dmsquash-live-root-include-fs_lib.sh.patch | 2 +-
0002-fix-live-crash-with-livenet-installed.patch | 2 +-
...tions-s-emergency-shutdown-shutdown-emerg.patch | 2 +-
0004-dracut-functions-speed-up-inst_dir.patch | 2 +-
...tions-new-function-inst_any-d-dest-f1-f2-.patch | 2 +-
...ctions-fix-inst_dir-for-non-absolute-dirs.patch | 2 +-
...-md-incremental-imsm.rules-incremental-ru.patch | 2 +-
...ild-initramfs-unclear-_mpargs-in-instmods.patch | 2 +-
...-save-and-restore-environment-given-from-.patch | 2 +-
...tions-hmac-checksum-files-can-be-symlinks.patch | 2 +-
0011-95udev-rules-add-input_id.patch | 2 +-
...nst_simple-inst_dir-make-fast-case-faster.patch | 2 +-
...el_modules-is-a-specialized-filter_kernel.patch | 2 +-
...nstall_kmod_with_fw-make-fast-case-faster.patch | 2 +-
...et-filenames-from-stdin-if-no-args-use-it.patch | 6 +-
0016-instmods-sanity-for-_mpargs.patch | 2 +-
...ctor-out-egrep-of-FATAL-Module-.-not-foun.patch | 2 +-
...-do-not-fail-when-importing-the-original-.patch | 2 +-
...ve-root-use-blkid-to-determine-fstype-of-.patch | 2 +-
...ve-root-load-filesystem-modules-before-mo.patch | 2 +-
...9base-init-remove-dev-root-helper-symlink.patch | 2 +-
...-mount-securityfs-with-source-securityfs-.patch | 2 +-
...nt-securityfs-in-a-seperate-dracut-module.patch | 2 +-
0027-90mdraid-adjust-stock-mdadm-udev-rules.patch | 2 +-
0028-90mdraid-containers-are-not-runnable.patch | 2 +-
...s-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch | 2 +-
...tions-inst_rules-do-not-check-std-dirs-fo.patch | 2 +-
0036-str_replace-fix.patch | 2 +-
...er-bail-out-early-if-we-don-t-have-to-log.patch | 2 +-
...dracut-create-dev-besides-proc-sys-and-so.patch | 2 +-
...fs-lib-export-FSTAB_FILE-before-fsck-call.patch | 2 +-
0040-dracut-functions-inst_rules-add-missing.patch | 2 +-
...draid-more-thorough-64-md-raid.rules-edit.patch | 2 +-
...H-Parameter-expansion-occurs-before-comma.patch | 2 +-
...raid-mdraid_start.sh-fix-path-to-md-sysfs.patch | 2 +-
...draid-module-setup.sh-fixed-sed-arguments.patch | 2 +-
0048-convert_abs_rel-fixups.patch | 2 +-
...unctions-conv-normalize-minor-corrections.patch | 2 +-
...lib.sh-fix-dropped-backslashes-in-CMDLINE.patch | 2 +-
0051-90livenet-check-for-wget.patch | 2 +-
0052-dracut-logger-re-set-debugging.patch | 2 +-
...nctions-inst_dir-handle-relative-symlinks.patch | 2 +-
...et-module-setup.sh-silence-check-for-wget.patch | 2 +-
0055-90livenet-do-not-install-by-default.patch | 2 +-
...tions-do-not-install-files-from-current-d.patch | 2 +-
...nst_script-should-call-inst_simple-750603.patch | 2 +-
...cut.spec-fixed-rhel-fedora-version-checks.patch | 2 +-
...dules-module-setup.sh-include-usb-mass-st.patch | 2 +-
0062-90mdraid-remove-mdadm_auto.sh-completly.patch | 2 +-
...sk.sh-use-key-file-if-specified-in-cryptt.patch | 2 +-
...draid-wait-for-md-devices-to-become-clean.patch | 2 +-
...-only-poll-cdroms-if-the-kernel-does-supp.patch | 2 +-
...ase-init-removed-cdrom-polling-reset-code.patch | 2 +-
...base-init-fix-check-for-in-kernel-polling.patch | 2 +-
0069-git2spec.pl-strip-path-from-patches.patch | 2 +-
...dules-module-setup.sh-install-modules.ord.patch | 2 +-
...draid-wait-for-md-devices-to-become-clean.patch | 2 +-
0072-add-30convertfs.patch | 260 ++++++++++++++++++++
0073-90mdraid-add-offroot-support.patch | 143 +++++++++++
59 files changed, 462 insertions(+), 59 deletions(-)
---
diff --git a/0001-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch b/0001-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
index 690bd67..a90da8e 100644
--- a/0001-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
+++ b/0001-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] 90dmsquash-live/dmsquash-live-root: include fs_lib.sh for
https://bugzilla.redhat.com/show_bug.cgi?id=730579
---
modules.d/90dmsquash-live/dmsquash-live-root | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root
index 265de19..90e633c 100755
diff --git a/0002-fix-live-crash-with-livenet-installed.patch b/0002-fix-live-crash-with-livenet-installed.patch
index 8f18c2b..dd89880 100644
--- a/0002-fix-live-crash-with-livenet-installed.patch
+++ b/0002-fix-live-crash-with-livenet-installed.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix live crash with livenet installed
parse-livenet.sh shouldn't mess with $root unless it finds a valid URL.
---
modules.d/90livenet/parse-livenet.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh
index 78fc906..323fd4a 100755
diff --git a/0003-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch b/0003-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
index 34160c7..bea7f4e 100644
--- a/0003-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
+++ b/0003-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut-functions: s/emergency-shutdown/shutdown-emergency/g
---
dracut-functions | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-functions b/dracut-functions
index 936d3c3..241d89a 100755
diff --git a/0004-dracut-functions-speed-up-inst_dir.patch b/0004-dracut-functions-speed-up-inst_dir.patch
index 7d00af0..9b2bb54 100644
--- a/0004-dracut-functions-speed-up-inst_dir.patch
+++ b/0004-dracut-functions-speed-up-inst_dir.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut-functions: speed up inst_dir()
---
dracut-functions | 18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
+ 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index 241d89a..d7f2e5f 100755
diff --git a/0005-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch b/0005-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
index bc3e2e1..9a0fa01 100644
--- a/0005-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
+++ b/0005-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] dracut-functions: new function: inst_any [-d dest] f1 [f2
---
dracut-functions | 28 ++++++++++++++++++++++++++++
- 1 files changed, 28 insertions(+), 0 deletions(-)
+ 1 file changed, 28 insertions(+)
diff --git a/dracut-functions b/dracut-functions
index d7f2e5f..43a6843 100755
diff --git a/0006-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch b/0006-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
index 761ef05..c273d3f 100644
--- a/0006-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
+++ b/0006-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut-functions: fix inst_dir() for non-absolute dirs
---
dracut-functions | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-functions b/dracut-functions
index 43a6843..a3340e4 100755
diff --git a/0007-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch b/0007-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
index 3ec5221..1afb5e6 100644
--- a/0007-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
+++ b/0007-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
@@ -9,7 +9,7 @@ move incremental run to settled queue again
https://bugzilla.redhat.com/show_bug.cgi?id=732967
---
modules.d/90mdraid/65-md-incremental-imsm.rules | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
index 4fc8428..7c1d503 100644
diff --git a/0008-build-initramfs-unclear-_mpargs-in-instmods.patch b/0008-build-initramfs-unclear-_mpargs-in-instmods.patch
index 1f7ed25..3930cd4 100644
--- a/0008-build-initramfs-unclear-_mpargs-in-instmods.patch
+++ b/0008-build-initramfs-unclear-_mpargs-in-instmods.patch
@@ -18,7 +18,7 @@ It seems to me that a leading "--" should inhibit modification.
Here's the corresponding patch to current HEAD (from dracut-013.)
---
dracut-functions | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index a3340e4..c28766e 100755
diff --git a/0009-99base-init-save-and-restore-environment-given-from-.patch b/0009-99base-init-save-and-restore-environment-given-from-.patch
index 5f279e9..053c4b1 100644
--- a/0009-99base-init-save-and-restore-environment-given-from-.patch
+++ b/0009-99base-init-save-and-restore-environment-given-from-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 99base/init: save and restore environment given from the
---
modules.d/99base/init | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 90128c7..4a91e53 100755
diff --git a/0010-dracut-functions-hmac-checksum-files-can-be-symlinks.patch b/0010-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
index 05ecd14..a202191 100644
--- a/0010-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
+++ b/0010-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] dracut-functions: hmac checksum files can be symlinks, too
use inst() instead of inst_simple() to install the hmac files
---
dracut-functions | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index c28766e..3edd4c7 100755
diff --git a/0011-95udev-rules-add-input_id.patch b/0011-95udev-rules-add-input_id.patch
index 1453d07..1aa6816 100644
--- a/0011-95udev-rules-add-input_id.patch
+++ b/0011-95udev-rules-add-input_id.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 95udev-rules: add input_id
---
modules.d/95udev-rules/module-setup.sh | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index 5bd5d59..876f7a3 100755
diff --git a/0012-inst_simple-inst_dir-make-fast-case-faster.patch b/0012-inst_simple-inst_dir-make-fast-case-faster.patch
index ec7f904..b3d3741 100644
--- a/0012-inst_simple-inst_dir-make-fast-case-faster.patch
+++ b/0012-inst_simple-inst_dir-make-fast-case-faster.patch
@@ -7,7 +7,7 @@ This small stuff saves 1.7% per dropped statement during "dracut --profile".
Fixing the comment about /lib -> lib64 is REQUIRED!
---
dracut-functions | 16 +++++-----------
- 1 files changed, 5 insertions(+), 11 deletions(-)
+ 1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index 3edd4c7..f41fc7d 100755
diff --git a/0013-filter_kernel_modules-is-a-specialized-filter_kernel.patch b/0013-filter_kernel_modules-is-a-specialized-filter_kernel.patch
index 9ab18bb..8f7a853 100644
--- a/0013-filter_kernel_modules-is-a-specialized-filter_kernel.patch
+++ b/0013-filter_kernel_modules-is-a-specialized-filter_kernel.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] filter_kernel_modules is a specialized
---
dracut-functions | 31 +++----------------------------
- 1 files changed, 3 insertions(+), 28 deletions(-)
+ 1 file changed, 3 insertions(+), 28 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index f41fc7d..a72aa53 100755
diff --git a/0014-install_kmod_with_fw-make-fast-case-faster.patch b/0014-install_kmod_with_fw-make-fast-case-faster.patch
index 3edc4b5..ed59896 100644
--- a/0014-install_kmod_with_fw-make-fast-case-faster.patch
+++ b/0014-install_kmod_with_fw-make-fast-case-faster.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] install_kmod_with_fw: make fast case faster
---
dracut-functions | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index a72aa53..4d3317c 100755
diff --git a/0015-instmods-get-filenames-from-stdin-if-no-args-use-it.patch b/0015-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
index cb2cce2..3bbb620 100644
--- a/0015-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
+++ b/0015-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
@@ -13,10 +13,10 @@ Together this is a large savings.
[harald at redhat.com: fixed network kernel module filter]
---
dracut-functions | 57 ++++++++++++++++++++--------
- modules.d/40network/module-setup.sh | 19 +++++++--
+ modules.d/40network/module-setup.sh | 19 +++++++---
modules.d/90kernel-modules/module-setup.sh | 11 +++++-
- modules.d/90multipath/module-setup.sh | 15 +++++--
- modules.d/95iscsi/module-setup.sh | 12 ++++-
+ modules.d/90multipath/module-setup.sh | 15 +++++---
+ modules.d/95iscsi/module-setup.sh | 12 ++++--
5 files changed, 84 insertions(+), 30 deletions(-)
diff --git a/dracut-functions b/dracut-functions
diff --git a/0016-instmods-sanity-for-_mpargs.patch b/0016-instmods-sanity-for-_mpargs.patch
index b9b8a9c..9d6e4ef 100644
--- a/0016-instmods-sanity-for-_mpargs.patch
+++ b/0016-instmods-sanity-for-_mpargs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] instmods: sanity for _mpargs
---
dracut-functions | 11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
+ 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index 556d309..6c16cae 100755
diff --git a/0017-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch b/0017-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
index 1c84a77..e7484a7 100644
--- a/0017-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
+++ b/0017-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] instmods: factor out egrep of "FATAL: Module .* not found"
---
dracut-functions | 34 +++++++++++++++++++---------------
- 1 files changed, 19 insertions(+), 15 deletions(-)
+ 1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index 6c16cae..507f0c3 100755
diff --git a/0018-99base-init-do-not-fail-when-importing-the-original-.patch b/0018-99base-init-do-not-fail-when-importing-the-original-.patch
index 56515ac..8700137 100644
--- a/0018-99base-init-do-not-fail-when-importing-the-original-.patch
+++ b/0018-99base-init-do-not-fail-when-importing-the-original-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 99base/init: do not fail, when importing the original kernel
---
modules.d/99base/init | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 4a91e53..30a5cf9 100755
diff --git a/0020-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch b/0020-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
index 0b5c9e6..51ddb46 100644
--- a/0020-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
+++ b/0020-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
@@ -8,7 +8,7 @@ dracut: FATAL: cannot mount live image (unknown filesystem type)
https://bugzilla.redhat.com/show_bug.cgi?id=735199
---
modules.d/90dmsquash-live/dmsquash-live-root | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root
index 90e633c..9bf4f09 100755
diff --git a/0021-dmsquash-live-root-load-filesystem-modules-before-mo.patch b/0021-dmsquash-live-root-load-filesystem-modules-before-mo.patch
index 207e18f..12ddb50 100644
--- a/0021-dmsquash-live-root-load-filesystem-modules-before-mo.patch
+++ b/0021-dmsquash-live-root-load-filesystem-modules-before-mo.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] dmsquash-live-root: load filesystem modules before mounting
might prevent https://bugzilla.redhat.com/show_bug.cgi?id=735199
---
modules.d/90dmsquash-live/dmsquash-live-root | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root
index 9bf4f09..77aae3f 100755
diff --git a/0022-99base-init-remove-dev-root-helper-symlink.patch b/0022-99base-init-remove-dev-root-helper-symlink.patch
index b875771..3e56f74 100644
--- a/0022-99base-init-remove-dev-root-helper-symlink.patch
+++ b/0022-99base-init-remove-dev-root-helper-symlink.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 99base/init: remove /dev/root helper symlink
Any tool relying on /dev/root has to be fixed.
---
modules.d/99base/init | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 30a5cf9..a759c44 100755
diff --git a/0024-99base-init-mount-securityfs-with-source-securityfs-.patch b/0024-99base-init-mount-securityfs-with-source-securityfs-.patch
index 0fb1e74..8e0f35f 100644
--- a/0024-99base-init-mount-securityfs-with-source-securityfs-.patch
+++ b/0024-99base-init-mount-securityfs-with-source-securityfs-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 99base/init: mount securityfs with source "securityfs"
---
modules.d/99base/init | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/99base/init b/modules.d/99base/init
index a759c44..680a785 100755
diff --git a/0026-mount-securityfs-in-a-seperate-dracut-module.patch b/0026-mount-securityfs-in-a-seperate-dracut-module.patch
index 78d3e4b..8ff0744 100644
--- a/0026-mount-securityfs-in-a-seperate-dracut-module.patch
+++ b/0026-mount-securityfs-in-a-seperate-dracut-module.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] mount securityfs in a seperate dracut module
---
dracut.spec | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
diff --git a/dracut.spec b/dracut.spec
index 4a71942..ff004c3 100644
diff --git a/0027-90mdraid-adjust-stock-mdadm-udev-rules.patch b/0027-90mdraid-adjust-stock-mdadm-udev-rules.patch
index 482d821..dfe191b 100644
--- a/0027-90mdraid-adjust-stock-mdadm-udev-rules.patch
+++ b/0027-90mdraid-adjust-stock-mdadm-udev-rules.patch
@@ -17,7 +17,7 @@ This patch adjusts the behaviour.
Signed-off-by: Michal Soltys <soltys at ziu.info>
---
modules.d/90mdraid/module-setup.sh | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
index de7785d..91a0769 100755
diff --git a/0028-90mdraid-containers-are-not-runnable.patch b/0028-90mdraid-containers-are-not-runnable.patch
index fd2b3f5..187f31d 100644
--- a/0028-90mdraid-containers-are-not-runnable.patch
+++ b/0028-90mdraid-containers-are-not-runnable.patch
@@ -15,7 +15,7 @@ Signed-off-by: Michal Soltys <soltys at ziu.info>
modules.d/90mdraid/md_finished.sh | 2 +-
modules.d/90mdraid/mdcontainer_start.sh | 12 ------------
modules.d/90mdraid/module-setup.sh | 1 -
- 4 files changed, 1 insertions(+), 34 deletions(-)
+ 4 files changed, 1 insertion(+), 34 deletions(-)
delete mode 100755 modules.d/90mdraid/mdcontainer_start.sh
diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
diff --git a/0034-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch b/0034-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
index 2a66b85..7d588e0 100644
--- a/0034-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
+++ b/0034-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 99fs-lib/fs-lib.sh: fsck btrfs via mounting like xfs
btrfsck is only for manual repairing your filesystem
---
modules.d/99fs-lib/fs-lib.sh | 33 ++++++++++++++++++++++++++++++++-
- 1 files changed, 32 insertions(+), 1 deletions(-)
+ 1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
index f7b20dd..edb5852 100755
diff --git a/0035-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch b/0035-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
index eb489fc..7e736f8 100644
--- a/0035-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
+++ b/0035-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
@@ -8,7 +8,7 @@ if an absolute path is given, we should not check the standard udev rule
directories.
---
dracut-functions | 14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
+ 1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index b11e37c..18a2e89 100755
diff --git a/0036-str_replace-fix.patch b/0036-str_replace-fix.patch
index 2799be6..8b24fc7 100644
--- a/0036-str_replace-fix.patch
+++ b/0036-str_replace-fix.patch
@@ -16,7 +16,7 @@ would return 'aayaayaa' instead of ' aay aayaa'.
Signed-off-by: Michal Soltys <soltys at ziu.info>
---
modules.d/99base/dracut-lib.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 50b1ed2..62c3bf5 100755
diff --git a/0037-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch b/0037-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
index 85ce4de..7a139d2 100644
--- a/0037-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
+++ b/0037-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] dracut-logger: bail out early, if we don't have to log
---
dracut-logger | 7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
+ 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dracut-logger b/dracut-logger
index d85cbaf..ce28208 100755
diff --git a/0038-dracut-create-dev-besides-proc-sys-and-so.patch b/0038-dracut-create-dev-besides-proc-sys-and-so.patch
index 1ab3941..2cc2697 100644
--- a/0038-dracut-create-dev-besides-proc-sys-and-so.patch
+++ b/0038-dracut-create-dev-besides-proc-sys-and-so.patch
@@ -7,7 +7,7 @@ How it worked without it? The issue only manifests itself with
initramfs integrated into kernel.
---
dracut | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut b/dracut
index 6ecb19a..ddafdef 100755
diff --git a/0039-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch b/0039-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
index 86cf77d..9f32a81 100644
--- a/0039-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
+++ b/0039-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 99fs-lib: export FSTAB_FILE before fsck call
Signed-off-by: Michal Soltys <soltys at ziu.info>
---
modules.d/99fs-lib/fs-lib.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
index edb5852..f36299a 100755
diff --git a/0040-dracut-functions-inst_rules-add-missing.patch b/0040-dracut-functions-inst_rules-add-missing.patch
index 088e112..df6ce2b 100644
--- a/0040-dracut-functions-inst_rules-add-missing.patch
+++ b/0040-dracut-functions-inst_rules-add-missing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut-functions: inst_rules() add missing ""
---
dracut-functions | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-functions b/dracut-functions
index 18a2e89..5508809 100755
diff --git a/0042-90mdraid-more-thorough-64-md-raid.rules-edit.patch b/0042-90mdraid-more-thorough-64-md-raid.rules-edit.patch
index 52dd1e6..fda89e0 100644
--- a/0042-90mdraid-more-thorough-64-md-raid.rules-edit.patch
+++ b/0042-90mdraid-more-thorough-64-md-raid.rules-edit.patch
@@ -8,7 +8,7 @@ Catch more variations of incremental assembly.
Signed-off-by: Michal Soltys <soltys at ziu.info>
---
modules.d/90mdraid/module-setup.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
index d4a9870..5e819b1 100755
diff --git a/0044-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch b/0044-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
index 0ec884e..9a19f91 100644
--- a/0044-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
+++ b/0044-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
@@ -21,7 +21,7 @@ ${parameter} on the right is expanded before evaluating "local var=value"
on the left.
---
dracut-functions | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-functions b/dracut-functions
index 5508809..c4f7f61 100755
diff --git a/0046-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch b/0046-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
index 37dbfd0..34526f3 100644
--- a/0046-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
+++ b/0046-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 90mdraid/mdraid_start.sh: fix path to md sysfs
---
modules.d/90mdraid/mdraid_start.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90mdraid/mdraid_start.sh b/modules.d/90mdraid/mdraid_start.sh
index f79f16e..f4b7ad0 100755
diff --git a/0047-90mdraid-module-setup.sh-fixed-sed-arguments.patch b/0047-90mdraid-module-setup.sh-fixed-sed-arguments.patch
index 37662ff..ecf77f7 100644
--- a/0047-90mdraid-module-setup.sh-fixed-sed-arguments.patch
+++ b/0047-90mdraid-module-setup.sh-fixed-sed-arguments.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 90mdraid/module-setup.sh: fixed sed arguments
---
modules.d/90mdraid/module-setup.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
index 5e819b1..fe793bb 100755
diff --git a/0048-convert_abs_rel-fixups.patch b/0048-convert_abs_rel-fixups.patch
index 211e444..a74c67e 100644
--- a/0048-convert_abs_rel-fixups.patch
+++ b/0048-convert_abs_rel-fixups.patch
@@ -14,7 +14,7 @@ Subject: [PATCH] convert_abs_rel() fixups
Signed-off-by: Michal Soltys <soltys at ziu.info>
---
dracut-functions | 18 +++++++++++-------
- 1 files changed, 11 insertions(+), 7 deletions(-)
+ 1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index c4f7f61..12dfa70 100755
diff --git a/0049-dracut-functions-conv-normalize-minor-corrections.patch b/0049-dracut-functions-conv-normalize-minor-corrections.patch
index 8d3f39b..083970b 100644
--- a/0049-dracut-functions-conv-normalize-minor-corrections.patch
+++ b/0049-dracut-functions-conv-normalize-minor-corrections.patch
@@ -13,7 +13,7 @@ mostly with reference to earlier commit:
Signed-off-by: Michal Soltys <soltys at ziu.info>
---
dracut-functions | 22 ++++++++++------------
- 1 files changed, 10 insertions(+), 12 deletions(-)
+ 1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index 12dfa70..ce593c9 100755
diff --git a/0050-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch b/0050-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
index 913f47d..21f94e4 100644
--- a/0050-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
+++ b/0050-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
@@ -9,7 +9,7 @@ your root device is something like "LABEL=Fedora\x2016".
Using "read -r" tells the shell to leave backslashes alone.
---
modules.d/99base/dracut-lib.sh | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 62c3bf5..bc4d7c9 100755
diff --git a/0051-90livenet-check-for-wget.patch b/0051-90livenet-check-for-wget.patch
index 7182d0c..75c1116 100644
--- a/0051-90livenet-check-for-wget.patch
+++ b/0051-90livenet-check-for-wget.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 90livenet: check() for wget
---
modules.d/90livenet/module-setup.sh | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh
index 3ae72de..2152123 100755
diff --git a/0052-dracut-logger-re-set-debugging.patch b/0052-dracut-logger-re-set-debugging.patch
index edeac08..0453cee 100644
--- a/0052-dracut-logger-re-set-debugging.patch
+++ b/0052-dracut-logger-re-set-debugging.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut-logger: re-set debugging
---
dracut-logger | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dracut-logger b/dracut-logger
index ce28208..f1b3a7e 100755
diff --git a/0053-dracut-functions-inst_dir-handle-relative-symlinks.patch b/0053-dracut-functions-inst_dir-handle-relative-symlinks.patch
index 9f25231..f405a65 100644
--- a/0053-dracut-functions-inst_dir-handle-relative-symlinks.patch
+++ b/0053-dracut-functions-inst_dir-handle-relative-symlinks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut-functions: inst_dir() handle relative symlinks
---
dracut-functions | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index ce593c9..6732804 100755
diff --git a/0054-90livenet-module-setup.sh-silence-check-for-wget.patch b/0054-90livenet-module-setup.sh-silence-check-for-wget.patch
index 36eb639..349f29f 100644
--- a/0054-90livenet-module-setup.sh-silence-check-for-wget.patch
+++ b/0054-90livenet-module-setup.sh-silence-check-for-wget.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 90livenet/module-setup.sh: silence check for wget
---
modules.d/90livenet/module-setup.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh
index 2152123..883994b 100755
diff --git a/0055-90livenet-do-not-install-by-default.patch b/0055-90livenet-do-not-install-by-default.patch
index c2a8225..1d243e9 100644
--- a/0055-90livenet-do-not-install-by-default.patch
+++ b/0055-90livenet-do-not-install-by-default.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 90livenet: do not install by default
---
modules.d/90livenet/module-setup.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh
index 883994b..c66dd4b 100755
diff --git a/0056-dracut-functions-do-not-install-files-from-current-d.patch b/0056-dracut-functions-do-not-install-files-from-current-d.patch
index 5c4c155..6a67ad2 100644
--- a/0056-dracut-functions-do-not-install-files-from-current-d.patch
+++ b/0056-dracut-functions-do-not-install-files-from-current-d.patch
@@ -8,7 +8,7 @@ Protect against relative pathnames without a slash for all inst_*()
functions.
---
dracut-functions | 38 +++++++++++++++++++++-----------------
- 1 files changed, 21 insertions(+), 17 deletions(-)
+ 1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/dracut-functions b/dracut-functions
index 6732804..23aa14f 100755
diff --git a/0057-inst_script-should-call-inst_simple-750603.patch b/0057-inst_script-should-call-inst_simple-750603.patch
index 3e59608..3330674 100644
--- a/0057-inst_script-should-call-inst_simple-750603.patch
+++ b/0057-inst_script-should-call-inst_simple-750603.patch
@@ -8,7 +8,7 @@ If it does it should not be calling inst_binary, it should call
inst_simple like it used to.
---
dracut-functions | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-functions b/dracut-functions
index 23aa14f..5e2acd3 100755
diff --git a/0058-dracut.spec-fixed-rhel-fedora-version-checks.patch b/0058-dracut.spec-fixed-rhel-fedora-version-checks.patch
index 8b28a6e..fd8ddd4 100644
--- a/0058-dracut.spec-fixed-rhel-fedora-version-checks.patch
+++ b/0058-dracut.spec-fixed-rhel-fedora-version-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut.spec: fixed rhel/fedora version checks
---
dracut.spec | 22 +++++++++++-----------
- 1 files changed, 11 insertions(+), 11 deletions(-)
+ 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/dracut.spec b/dracut.spec
index ff004c3..f9848ed 100644
diff --git a/0061-90kernel-modules-module-setup.sh-include-usb-mass-st.patch b/0061-90kernel-modules-module-setup.sh-include-usb-mass-st.patch
index 861c9f7..d23a5ab 100644
--- a/0061-90kernel-modules-module-setup.sh-include-usb-mass-st.patch
+++ b/0061-90kernel-modules-module-setup.sh-include-usb-mass-st.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] 90kernel-modules/module-setup.sh: include usb mass storage
backport of commit e696ade15d9284fc6e3499a69a9b389587430a34
---
modules.d/90kernel-modules/module-setup.sh | 7 +------
- 1 files changed, 1 insertions(+), 6 deletions(-)
+ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 9fc4248..0252502 100755
diff --git a/0062-90mdraid-remove-mdadm_auto.sh-completly.patch b/0062-90mdraid-remove-mdadm_auto.sh-completly.patch
index 6072e1d..f613155 100644
--- a/0062-90mdraid-remove-mdadm_auto.sh-completly.patch
+++ b/0062-90mdraid-remove-mdadm_auto.sh-completly.patch
@@ -8,7 +8,7 @@ add new appearing devices.
---
modules.d/90mdraid/65-md-incremental-imsm.rules | 9 ---------
modules.d/90mdraid/mdadm_auto.sh | 7 -------
- 2 files changed, 0 insertions(+), 16 deletions(-)
+ 2 files changed, 16 deletions(-)
delete mode 100755 modules.d/90mdraid/mdadm_auto.sh
diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
diff --git a/0063-cryptroot-ask.sh-use-key-file-if-specified-in-cryptt.patch b/0063-cryptroot-ask.sh-use-key-file-if-specified-in-cryptt.patch
index d761ded..e68acdf 100644
--- a/0063-cryptroot-ask.sh-use-key-file-if-specified-in-cryptt.patch
+++ b/0063-cryptroot-ask.sh-use-key-file-if-specified-in-cryptt.patch
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=751640
backport of commit 4e05cb4023966a828ad90432816467a1da540120
---
modules.d/90crypt/cryptroot-ask.sh | 21 ++++++++++++++++-----
- 1 files changed, 16 insertions(+), 5 deletions(-)
+ 1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
index f8e1bd8..88938d7 100755
diff --git a/0064-90mdraid-wait-for-md-devices-to-become-clean.patch b/0064-90mdraid-wait-for-md-devices-to-become-clean.patch
index 58c786c..6addd4b 100644
--- a/0064-90mdraid-wait-for-md-devices-to-become-clean.patch
+++ b/0064-90mdraid-wait-for-md-devices-to-become-clean.patch
@@ -8,7 +8,7 @@ clean, before booting further.
---
modules.d/90mdraid/mdraid-waitclean.sh | 25 +++++++++++++++++++++++++
modules.d/90mdraid/module-setup.sh | 1 +
- 2 files changed, 26 insertions(+), 0 deletions(-)
+ 2 files changed, 26 insertions(+)
create mode 100755 modules.d/90mdraid/mdraid-waitclean.sh
diff --git a/modules.d/90mdraid/mdraid-waitclean.sh b/modules.d/90mdraid/mdraid-waitclean.sh
diff --git a/0065-99base-init-only-poll-cdroms-if-the-kernel-does-supp.patch b/0065-99base-init-only-poll-cdroms-if-the-kernel-does-supp.patch
index b651586..3106d94 100644
--- a/0065-99base-init-only-poll-cdroms-if-the-kernel-does-supp.patch
+++ b/0065-99base-init-only-poll-cdroms-if-the-kernel-does-supp.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 99base/init: only poll cdroms, if the kernel does support
---
modules.d/99base/init | 34 +++++++++++++++-------------------
- 1 files changed, 15 insertions(+), 19 deletions(-)
+ 1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/modules.d/99base/init b/modules.d/99base/init
index b61680a..dc2cdfa 100755
diff --git a/0066-99base-init-removed-cdrom-polling-reset-code.patch b/0066-99base-init-removed-cdrom-polling-reset-code.patch
index 908ab6a..af45f1a 100644
--- a/0066-99base-init-removed-cdrom-polling-reset-code.patch
+++ b/0066-99base-init-removed-cdrom-polling-reset-code.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 99base/init: removed cdrom polling reset code
This is done globally now.
---
modules.d/99base/init | 8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
+ 1 file changed, 8 deletions(-)
diff --git a/modules.d/99base/init b/modules.d/99base/init
index dc2cdfa..1f0e342 100755
diff --git a/0067-99base-init-fix-check-for-in-kernel-polling.patch b/0067-99base-init-fix-check-for-in-kernel-polling.patch
index ca8c3db..7be30e8 100644
--- a/0067-99base-init-fix-check-for-in-kernel-polling.patch
+++ b/0067-99base-init-fix-check-for-in-kernel-polling.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 99base/init: fix check for in kernel polling
---
modules.d/99base/init | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 1f0e342..acdda43 100755
diff --git a/0069-git2spec.pl-strip-path-from-patches.patch b/0069-git2spec.pl-strip-path-from-patches.patch
index 8e31e7e..42377b6 100644
--- a/0069-git2spec.pl-strip-path-from-patches.patch
+++ b/0069-git2spec.pl-strip-path-from-patches.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] git2spec.pl: strip path from patches
---
git2spec.pl | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
diff --git a/git2spec.pl b/git2spec.pl
index 27e5889..38f899a 100755
diff --git a/0070-90kernel-modules-module-setup.sh-install-modules.ord.patch b/0070-90kernel-modules-module-setup.sh-install-modules.ord.patch
index fa52d38..9d54af2 100644
--- a/0070-90kernel-modules-module-setup.sh-install-modules.ord.patch
+++ b/0070-90kernel-modules-module-setup.sh-install-modules.ord.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 90kernel-modules/module-setup.sh: install modules.order
Also install modules.order and all modules.builtin*
---
modules.d/90kernel-modules/module-setup.sh | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
+ 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 0252502..f575e85 100755
diff --git a/0071-Revert-90mdraid-wait-for-md-devices-to-become-clean.patch b/0071-Revert-90mdraid-wait-for-md-devices-to-become-clean.patch
index 856e416..c38a855 100644
--- a/0071-Revert-90mdraid-wait-for-md-devices-to-become-clean.patch
+++ b/0071-Revert-90mdraid-wait-for-md-devices-to-become-clean.patch
@@ -7,7 +7,7 @@ This reverts commit e8afcd2b866da7f1af56d5ccaa395eec6500f135.
---
modules.d/90mdraid/mdraid-waitclean.sh | 25 -------------------------
modules.d/90mdraid/module-setup.sh | 1 -
- 2 files changed, 0 insertions(+), 26 deletions(-)
+ 2 files changed, 26 deletions(-)
delete mode 100755 modules.d/90mdraid/mdraid-waitclean.sh
diff --git a/modules.d/90mdraid/mdraid-waitclean.sh b/modules.d/90mdraid/mdraid-waitclean.sh
diff --git a/0072-add-30convertfs.patch b/0072-add-30convertfs.patch
new file mode 100644
index 0000000..1d462ff
--- /dev/null
+++ b/0072-add-30convertfs.patch
@@ -0,0 +1,260 @@
+From 4b2a50d82dbc8a739f5d98010d4e0e1a77c610de Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 26 Mar 2012 09:50:58 +0200
+Subject: [PATCH] add 30convertfs
+
+---
+ dracut.spec | 1 +
+ modules.d/30convertfs/convertfs.sh | 184 +++++++++++++++++++++++++++++++++
+ modules.d/30convertfs/do-convertfs.sh | 11 ++
+ modules.d/30convertfs/module-setup.sh | 20 ++++
+ 4 files changed, 216 insertions(+)
+ create mode 100755 modules.d/30convertfs/convertfs.sh
+ create mode 100755 modules.d/30convertfs/do-convertfs.sh
+ create mode 100755 modules.d/30convertfs/module-setup.sh
+
+diff --git a/dracut.spec b/dracut.spec
+index 69809ca..0f9e552 100644
+--- a/dracut.spec
++++ b/dracut.spec
+@@ -234,6 +234,7 @@ rm -rf $RPM_BUILD_ROOT
+ %{_datadir}/dracut/modules.d/05busybox
+ %{_datadir}/dracut/modules.d/10i18n
+ %{_datadir}/dracut/modules.d/10rpmversion
++%{_datadir}/dracut/modules.d/30convertfs
+ %{_datadir}/dracut/modules.d/50plymouth
+ %{_datadir}/dracut/modules.d/60xen
+ %{_datadir}/dracut/modules.d/90btrfs
+diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh
+new file mode 100755
+index 0000000..d1d25aa
+--- /dev/null
++++ b/modules.d/30convertfs/convertfs.sh
+@@ -0,0 +1,184 @@
++#!/bin/bash
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
++
++ROOT="$1"
++
++if [[ ! -d "$ROOT" ]]; then
++ echo "Usage: $0 <rootdir>"
++ exit 1
++fi
++
++if [[ "$ROOT" -ef / ]]; then
++ echo "Can't convert the running system."
++ echo "Please boot with 'rd.convertfs' on the kernel command line,"
++ echo "to update with the help of the initramfs,"
++ echo "or run this script from a rescue system."
++ exit 1
++fi
++
++while [[ "$ROOT" != "${ROOT%/}" ]]; do
++ ROOT=${ROOT%/}
++done
++
++if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then
++ echo "Converting /var/run to symlink"
++ mv -f $ROOT/var/run $ROOT/var/run.runmove~
++ ln -sfn ../run $ROOT/var/run
++fi
++
++if [ ! -L $ROOT/var/lock -a -e $ROOT/var/lock ]; then
++ echo "Converting /var/lock to symlink"
++ mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~
++ ln -sfn ../run/lock $ROOT/var/lock
++fi
++
++needconvert() {
++ for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64"; do
++ if [[ -e "$dir" ]]; then
++ [[ -L "$dir" ]] || return 0
++ fi
++ done
++ return 1
++}
++
++if ! [ -e "$ROOT/usr/bin" ]; then
++ echo "$ROOT/usr/bin does not exist!"
++ echo "Make sure, the kernel command line has enough information"
++ echo "to mount /usr (man dracut.cmdline)"
++ exit 1
++fi
++
++
++if ! needconvert; then
++ echo "Your system is already converted."
++ exit 0
++fi
++
++testfile="$ROOT/.usrmovecheck$$"
++rm -f "$testfile"
++> "$testfile"
++if [[ ! -e "$testfile" ]]; then
++ echo "Cannot write to $ROOT/"
++ exit 1
++fi
++rm -f "$testfile"
++
++testfile="$ROOT/usr/.usrmovecheck$$"
++rm -f "$testfile"
++> "$testfile"
++if [[ ! -e "$testfile" ]]; then
++ echo "Cannot write to $ROOT/usr/"
++ exit 1
++fi
++rm -f "$testfile"
++
++ismounted() {
++ while read a m a; do
++ [[ "$m" = "$1" ]] && return 0
++ done < /proc/mounts
++ return 1
++}
++
++# clean up after ourselves no matter how we die.
++cleanup() {
++ echo "Something failed. Move back to the original state"
++ for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
++ "$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
++ "$ROOT/usr/lib64"; do
++ [[ -d "${dir}.usrmove-new" ]] && rm -fr "${dir}.usrmove-new"
++ if [[ -d "${dir}.usrmove-old" ]]; then
++ mv "$dir" "${dir}.del~"
++ mv "${dir}.usrmove-old" "$dir"
++ rm -fr "${dir}.del~"
++ fi
++ done
++}
++
++trap 'ret=$?; [[ $ret -ne 0 ]] && cleanup;exit $ret;' EXIT
++trap 'exit 1;' SIGINT
++
++ismounted "$ROOT/usr" || CP_HARDLINK="-l"
++
++set -e
++
++# merge / and /usr in new dir in /usr
++for dir in bin sbin lib lib64; do
++ rm -rf "$ROOT/usr/${dir}.usrmove-new"
++ [[ -L "$ROOT/$dir" ]] && continue
++ [[ -d "$ROOT/$dir" ]] || continue
++ echo "Make a copy of \`$ROOT/usr/$dir'."
++ [[ -d "$ROOT/usr/$dir" ]] \
++ && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
++ echo "Merge the copy with \`$ROOT/$dir'."
++ [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
++ || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
++ cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
++ echo "Clean up duplicates in \`$ROOT/usr/$dir'."
++ # delete all symlinks that have been backed up
++ find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
++ # replace symlink with backed up binary
++ find "$ROOT/usr/${dir}.usrmove-new" \
++ -name '*.usrmove~' \
++ -type f \
++ -exec bash -c 'p="{}";o=${p%%%%.usrmove~};
++ [[ -L "$o" ]] && mv -f "$p" "$o"' ';' || :
++done
++# switch over merged dirs in /usr
++for dir in bin sbin lib lib64; do
++ [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
++ echo "Switch to new \`$ROOT/usr/$dir'."
++ rm -fr "$ROOT/usr/${dir}.usrmove-old"
++ mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
++ mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
++done
++
++# replace dirs in / with links to /usr
++for dir in bin sbin lib lib64; do
++ [[ -L "$ROOT/$dir" ]] && continue
++ [[ -d "$ROOT/$dir" ]] || continue
++ echo "Create \`$ROOT/$dir' symlink."
++ rm -rf "$ROOT/${dir}.usrmove-old" || :
++ mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
++ ln -sfn usr/$dir "$ROOT/$dir"
++done
++
++echo "Clean up backup files."
++# everything seems to work; cleanup
++for dir in bin sbin lib lib64; do
++ # if we get killed in the middle of "rm -rf", ensure not to leave
++ # an incomplete directory, which is moved back by cleanup()
++ [[ -d "$ROOT/usr/${dir}.usrmove-old" ]] \
++ && mv "$ROOT/usr/${dir}.usrmove-old" "$ROOT/usr/${dir}.usrmove-old~"
++ [[ -d "$ROOT/${dir}.usrmove-old" ]] \
++ && mv "$ROOT/${dir}.usrmove-old" "$ROOT/${dir}.usrmove-old~"
++done
++
++for dir in bin sbin lib lib64; do
++ [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
++ && rm -rf "$ROOT/usr/${dir}.usrmove-old~" || :
++ [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
++ && rm -rf "$ROOT/${dir}.usrmove-old~" || :
++done
++
++for dir in lib lib64; do
++ [[ -d "$ROOT/$dir" ]] || continue
++ for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
++ [[ -f $lib ]] || continue
++ mv $lib ${lib/.so/_so}
++ done
++done
++
++set +e
++
++echo "Run ldconfig."
++ldconfig -r "$ROOT"
++
++. $ROOT/etc/selinux/config
++if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts ]; then
++ echo "Fixing SELinux labels"
++ setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :
++fi
++
++echo "Done."
++exit 0
+diff --git a/modules.d/30convertfs/do-convertfs.sh b/modules.d/30convertfs/do-convertfs.sh
+new file mode 100755
+index 0000000..99738e3
+--- /dev/null
++++ b/modules.d/30convertfs/do-convertfs.sh
+@@ -0,0 +1,11 @@
++#!/bin/bash
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
++
++if getargbool 0 rd.convertfs; then
++ if getargbool 0 rd.debug; then
++ bash -x convertfs "$NEWROOT" 2>&1 | vinfo
++ else
++ convertfs "$NEWROOT" 2>&1 | vinfo
++ fi
++fi
+diff --git a/modules.d/30convertfs/module-setup.sh b/modules.d/30convertfs/module-setup.sh
+new file mode 100755
+index 0000000..48ffa3e
+--- /dev/null
++++ b/modules.d/30convertfs/module-setup.sh
+@@ -0,0 +1,20 @@
++#!/bin/bash
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
++
++check() {
++ [[ $mount_needs ]] && return 1
++ return 255
++}
++
++depends() {
++ return 0
++}
++
++install() {
++ dracut_install bash
++ dracut_install find ldconfig mv rm cp ln
++ inst_hook pre-pivot 99 "$moddir/do-convertfs.sh"
++ inst "$moddir/convertfs.sh" /usr/bin/convertfs
++}
++
diff --git a/0073-90mdraid-add-offroot-support.patch b/0073-90mdraid-add-offroot-support.patch
new file mode 100644
index 0000000..32d339c
--- /dev/null
+++ b/0073-90mdraid-add-offroot-support.patch
@@ -0,0 +1,143 @@
+From 1634cdf246eb138ff18b6609a1249e3e31b3feb9 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 13 Feb 2012 21:16:31 +0100
+Subject: [PATCH] 90mdraid: add "--offroot" support
+
+---
+ modules.d/90mdraid/65-md-incremental-imsm.rules | 2 +-
+ modules.d/90mdraid/md-shutdown.sh | 3 ++-
+ modules.d/90mdraid/mdraid-cleanup.sh | 7 +++---
+ modules.d/90mdraid/mdraid-waitclean.sh | 27 +++++++++++++++++++++++
+ modules.d/90mdraid/mdraid_start.sh | 6 +++--
+ modules.d/90mdraid/parse-md.sh | 2 ++
+ 6 files changed, 40 insertions(+), 7 deletions(-)
+ create mode 100755 modules.d/90mdraid/mdraid-waitclean.sh
+
+diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
+index 80e6aab..c4334db 100644
+--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
++++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
+@@ -35,6 +35,6 @@ RUN+="/sbin/initqueue --timeout --name 50-mdraid_start --onetime --unique /sbin/
+ #
+ LABEL="md_incremental"
+
+-RUN+="/sbin/mdadm -I $env{DEVNAME}"
++RUN+="/sbin/mdadm $env{rd_MD_OFFROOT} -I $env{DEVNAME}"
+
+ LABEL="md_end"
+diff --git a/modules.d/90mdraid/md-shutdown.sh b/modules.d/90mdraid/md-shutdown.sh
+index bc36166..0d41008 100644
+--- a/modules.d/90mdraid/md-shutdown.sh
++++ b/modules.d/90mdraid/md-shutdown.sh
+@@ -4,8 +4,9 @@
+ _do_md_shutdown() {
+ local ret
+ local final=$1
++ local _offroot=$(strstr "$(mdadm --help-options 2>&1)" offroot && echo --offroot)
+ info "Disassembling mdraid devices."
+- mdadm -v --stop --scan
++ mdadm $_offroot -v --stop --scan
+ ret=$?
+ if [ "x$final" != "x" ]; then
+ info "cat /proc/mdstat"
+diff --git a/modules.d/90mdraid/mdraid-cleanup.sh b/modules.d/90mdraid/mdraid-cleanup.sh
+index 3ffa2d3..da86d65 100755
+--- a/modules.d/90mdraid/mdraid-cleanup.sh
++++ b/modules.d/90mdraid/mdraid-cleanup.sh
+@@ -4,6 +4,7 @@
+
+ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
++_offroot=$(strstr "$(mdadm --help-options 2>&1)" offroot && echo --offroot)
+ containers=""
+ for md in /dev/md[0-9_]*; do
+ [ -b "$md" ] || continue
+@@ -13,11 +14,11 @@ for md in /dev/md[0-9_]*; do
+ containers="$containers $md"
+ continue
+ fi
+- mdadm -S "$md" >/dev/null 2>&1
++ mdadm $_offroot -S "$md" >/dev/null 2>&1
+ done
+
+ for md in $containers; do
+- mdadm -S "$md" >/dev/null 2>&1
++ mdadm $_offroot -S "$md" >/dev/null 2>&1
+ done
+
+-unset containers udevinfo
++unset containers udevinfo _offroot
+diff --git a/modules.d/90mdraid/mdraid-waitclean.sh b/modules.d/90mdraid/mdraid-waitclean.sh
+new file mode 100755
+index 0000000..68204dd
+--- /dev/null
++++ b/modules.d/90mdraid/mdraid-waitclean.sh
+@@ -0,0 +1,27 @@
++#!/bin/sh
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
++
++if getargbool 0 rd.md.waitclean; then
++ _offroot=$(strstr "$(mdadm --help-options 2>&1)" offroot && echo --offroot)
++ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
++ containers=""
++ for md in /dev/md[0-9_]*; do
++ [ -b "$md" ] || continue
++ udevinfo="$(udevadm info --query=env --name=$md)"
++ strstr "$udevinfo" "DEVTYPE=partition" && continue
++ if strstr "$udevinfo" "MD_LEVEL=container"; then
++ containers="$containers $md"
++ continue
++ fi
++ info "Waiting for $md to become clean"
++ mdadm $_offroot -W "$md" >/dev/null 2>&1
++ done
++
++ for md in $containers; do
++ info "Waiting for $md to become clean"
++ mdadm $_offroot -W "$md" >/dev/null 2>&1
++ done
++
++ unset containers udevinfo _offroot
++fi
+diff --git a/modules.d/90mdraid/mdraid_start.sh b/modules.d/90mdraid/mdraid_start.sh
+index f4b7ad0..545a835 100755
+--- a/modules.d/90mdraid/mdraid_start.sh
++++ b/modules.d/90mdraid/mdraid_start.sh
+@@ -7,6 +7,8 @@ _md_force_run() {
+ local _udevinfo
+ local _path_s
+ local _path_d
++ local _offroot
++ _offroot=$(strstr "$(mdadm --help-options 2>&1)" offroot && echo --offroot)
+ # try to force-run anything not running yet
+ for md in /dev/md[0-9_]*; do
+ [ -b "$md" ] || continue
+@@ -20,7 +22,7 @@ _md_force_run() {
+ # inactive ?
+ [ "$(cat "$_path_s")" != "inactive" ] && continue
+
+- mdadm -R "$md" 2>&1 | vinfo
++ mdadm $_offroot -R "$md" 2>&1 | vinfo
+
+ # still inactive ?
+ [ "$(cat "$_path_s")" = "inactive" ] && continue
+@@ -29,7 +31,7 @@ _md_force_run() {
+ [ ! -r "$_path_d" ] && continue
+
+ # workaround for mdmon bug
+- [ "$(cat "$_path_d")" -gt "0" ] && mdmon --takeover "$md"
++ [ "$(cat "$_path_d")" -gt "0" ] && mdmon $_offroot --takeover "$md"
+ done
+ }
+
+diff --git a/modules.d/90mdraid/parse-md.sh b/modules.d/90mdraid/parse-md.sh
+index b85a3a3..1482f2f 100755
+--- a/modules.d/90mdraid/parse-md.sh
++++ b/modules.d/90mdraid/parse-md.sh
+@@ -51,3 +51,5 @@ if ! getargbool 1 rd.md.ddf -n rd_NO_MDDDF || getarg noddfmd || getarg nodmraid;
+ info "no MD RAID for SNIA ddf raids"
+ udevproperty rd_NO_MDDDF=1
+ fi
++
++strstr "$(mdadm --help-options 2>&1)" offroot && udevproperty rd_MD_OFFROOT=--offroot
More information about the scm-commits
mailing list