[dracut/f16: 1/2] dracut-018-60.git20120927
Harald Hoyer
harald at fedoraproject.org
Thu Sep 27 09:43:57 UTC 2012
commit 1f565f8b7ff7d45b63dc01517c8ba88920833179
Author: Harald Hoyer <harald at redhat.com>
Date: Thu Sep 27 11:40:04 2012 +0200
dracut-018-60.git20120927
- run dracut-shutdown.service before shutdown.target
Resolves: rhbz#840120
- do not create the initramfs world readable
Resolves: rhbz#859448
- mdraid: do the dracut shutdown, if a md raid is found
- mdraid: handle nested md raids
- mdraid: wait until devices are clean on shutdown
Resolves: rhbz#732297 rhbz#840562
...-add-str_ends-to-go-along-with-str_starts.patch | 2 +-
...tup_net-at-start-of-initqueue-online-hook.patch | 4 +-
...-save_netinfo-fix-problems-with-nfs-NM-ta.patch | 4 +-
...ep-work-as-documented-with-less-vars-than.patch | 2 +-
...tdown-use-emergency_shell-from-dracut-lib.patch | 4 +-
...k-avoid-remount-when-options-don-t-change.patch | 2 +-
0007-Debian-multiarch-support.patch | 24 ++++----
...og-installed-modules-to-initdir-lib-dracu.patch | 2 +-
0009-lvm-disable-lvmetad.patch | 4 +-
0010-udev-rules-remove-01-ignore.rules.patch | 4 +-
0011-lsinitrd-support-symlinks.patch | 2 +-
...acut.cmdline.7.asc-document-resume-option.patch | 2 +-
...-do-not-include-IMA-and-selinux-modules-w.patch | 2 +-
...un-plymouth-hook-if-the-binary-is-missing.patch | 2 +-
0015-man-Fix-add-fstab-option-in-man-page.patch | 2 +-
...base-init.sh-mount-tmpfs-with-strictatime.patch | 2 +-
0017-99shutdown-shutdown.sh-export-PATH.patch | 2 +-
...-do-not-install-systemd-service-in-reboot.patch | 2 +-
...ule-setup.sh-include-all-kernel-drivers-n.patch | 2 +-
0020-add-pre-pivot-cleanup-hook.patch | 10 ++--
...cleanup-scripts-to-pre-pivot-cleanup-hook.patch | 10 ++--
...parse-ip-opts.sh-remove-check-for-netroot.patch | 2 +-
...te-DNS1-.-for-nameserver-args-RHBZ-815369.patch | 2 +-
...on-t-add-existing-handlers-multiple-times.patch | 2 +-
...-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch | 2 +-
...odule-setup.sh-fix-host-only-mount-checks.patch | 2 +-
...odule-setup.sh-fix-host-only-mount-checks.patch | 2 +-
...line-arg-duplicating-bug-with-etc-cmdline.patch | 2 +-
0029-ifcfg-fix-resolv.conf.patch | 2 +-
...FSRAID-add-one-more-partition-to-the-btrf.patch | 4 +-
...-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch | 2 +-
0032-Fail-to-boot-if-mediacheck-fails-817419.patch | 2 +-
...-ifcfg.sh-add-s390-specific-configuration.patch | 2 +-
0034-Makefile-call-git2spec.pl-with-LANG-C.patch | 2 +-
...re-that-we-get-the-storage-modules-into-t.patch | 2 +-
...he-right-argument-for-dasd-module-options.patch | 2 +-
...e-dasd-arg-contents-into-proper-dasd.conf.patch | 4 +-
...alize-dasd-argument-content-for-dasd.conf.patch | 4 +-
...-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch | 2 +-
...ules-for-kdump-we-don-t-specify-netroot-i.patch | 4 +-
...-lib-url-lib.sh-disable-curl-progress-bar.patch | 2 +-
...p.sh-do-not-default-to-dhcp-for-interface.patch | 2 +-
...do-not-arping-with-qeth-layer3-interfaces.patch | 4 +-
...down.service-do-not-unpack-old-initramfs-.patch | 2 +-
...d.luks.allow-discards-and-honor-options-i.patch | 4 +-
...rse-dasd-mod.sh-fixed-dasd_mod-param-gene.patch | 2 +-
...urn-value-of-some-installkernel-functions.patch | 4 +-
...o-not-rely-on-the-presence-of-lib64-check.patch | 2 +-
...Don-t-set-an-already-set-attribute-826357.patch | 2 +-
0050-add-filesystem-options-to-fsck_single.patch | 10 ++--
...ange-rd.dasd-to-dasd_mod-kernel-parameter.patch | 4 +-
...c-remove-typo-from-BuildRequires-for-suse.patch | 2 +-
0053-move-dracut-back-to-usr-share.patch | 14 ++--
...ed-setsid-and-util-linux-2.21-requirement.patch | 6 +-
...down.service-execute-before-shutdown.targ.patch | 23 ++++++++
...h-create-the-initramfs-non-world-readable.patch | 24 ++++++++
...ys-create-need_shutdown-if-we-have-assemb.patch | 60 ++++++++++++++++++++
0058-mdraid-catch-nested-md-raids.patch | 27 +++++++++
...hutdown.sh-wait-until-md-devices-are-clea.patch | 34 +++++++++++
dracut.spec | 17 +++++-
60 files changed, 282 insertions(+), 99 deletions(-)
---
diff --git a/0001-dracut-lib-add-str_ends-to-go-along-with-str_starts.patch b/0001-dracut-lib-add-str_ends-to-go-along-with-str_starts.patch
index 21fdb61..4ef2885 100644
--- a/0001-dracut-lib-add-str_ends-to-go-along-with-str_starts.patch
+++ b/0001-dracut-lib-add-str_ends-to-go-along-with-str_starts.patch
@@ -4,7 +4,7 @@ Date: Thu, 5 Apr 2012 13:01:35 -0400
Subject: [PATCH] dracut-lib: add str_ends, to go along with str_starts
---
- modules.d/99base/dracut-lib.sh | 5 +++++
+ modules.d/99base/dracut-lib.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
diff --git a/0002-run-setup_net-at-start-of-initqueue-online-hook.patch b/0002-run-setup_net-at-start-of-initqueue-online-hook.patch
index 1f0edc6..1c5e4b9 100644
--- a/0002-run-setup_net-at-start-of-initqueue-online-hook.patch
+++ b/0002-run-setup_net-at-start-of-initqueue-online-hook.patch
@@ -9,8 +9,8 @@ initqueue/online hook.
It also makes it so you can run setup_net repeatedly without causing
error messages.
---
- modules.d/40network/net-genrules.sh | 3 +++
- modules.d/40network/net-lib.sh | 3 +++
+ modules.d/40network/net-genrules.sh | 3 +++
+ modules.d/40network/net-lib.sh | 3 +++
2 files changed, 6 insertions(+)
diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
diff --git a/0003-network-add-save_netinfo-fix-problems-with-nfs-NM-ta.patch b/0003-network-add-save_netinfo-fix-problems-with-nfs-NM-ta.patch
index 5488f55..403a2d0 100644
--- a/0003-network-add-save_netinfo-fix-problems-with-nfs-NM-ta.patch
+++ b/0003-network-add-save_netinfo-fix-problems-with-nfs-NM-ta.patch
@@ -11,8 +11,8 @@ lease. This lets the ifcfg module do its magic.
save_netinfo should properly write out /tmp/net.ifaces when needed, and
copies the dhclient files into place.
---
- modules.d/40network/net-lib.sh | 16 ++++++++++++++++
- modules.d/40network/netroot.sh | 10 ++--------
+ modules.d/40network/net-lib.sh | 16 ++++++++++++++++
+ modules.d/40network/netroot.sh | 10 ++--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
diff --git a/0004-Make-splitsep-work-as-documented-with-less-vars-than.patch b/0004-Make-splitsep-work-as-documented-with-less-vars-than.patch
index b6188c0..bd70a3d 100644
--- a/0004-Make-splitsep-work-as-documented-with-less-vars-than.patch
+++ b/0004-Make-splitsep-work-as-documented-with-less-vars-than.patch
@@ -10,7 +10,7 @@ According to its comment in dracut-lib.sh:
should set two="all:the:rest". But there's no check to see if the
current field is the last field, so it just gets "all".
---
- modules.d/99base/dracut-lib.sh | 3 ++-
+ modules.d/99base/dracut-lib.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
diff --git a/0005-shutdown-use-emergency_shell-from-dracut-lib.patch b/0005-shutdown-use-emergency_shell-from-dracut-lib.patch
index adffe75..d646775 100644
--- a/0005-shutdown-use-emergency_shell-from-dracut-lib.patch
+++ b/0005-shutdown-use-emergency_shell-from-dracut-lib.patch
@@ -4,8 +4,8 @@ Date: Thu, 5 Apr 2012 13:01:39 -0400
Subject: [PATCH] shutdown: use emergency_shell from dracut-lib
---
- modules.d/99base/dracut-lib.sh | 10 ++++----
- modules.d/99shutdown/shutdown.sh | 47 +++-----------------------------------
+ modules.d/99base/dracut-lib.sh | 10 +++++----
+ modules.d/99shutdown/shutdown.sh | 47 +++-------------------------------------
2 files changed, 9 insertions(+), 48 deletions(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
diff --git a/0006-rootfs-block-avoid-remount-when-options-don-t-change.patch b/0006-rootfs-block-avoid-remount-when-options-don-t-change.patch
index 189a976..f9e08ca 100644
--- a/0006-rootfs-block-avoid-remount-when-options-don-t-change.patch
+++ b/0006-rootfs-block-avoid-remount-when-options-don-t-change.patch
@@ -14,7 +14,7 @@ change.
Detect and optimize for this case so that the filesystem is only
mounted once.
---
- modules.d/95rootfs-block/mount-root.sh | 12 ++++++++----
+ modules.d/95rootfs-block/mount-root.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
diff --git a/0007-Debian-multiarch-support.patch b/0007-Debian-multiarch-support.patch
index bcc733d..4cad8d8 100644
--- a/0007-Debian-multiarch-support.patch
+++ b/0007-Debian-multiarch-support.patch
@@ -11,18 +11,18 @@ directory:
inst_libdir_file "libdevmapper-event-lvm*.so"
---
- dracut-functions.sh | 28 ++++++++++++++++++++++++++++
- dracut.sh | 12 ++++++++++--
- modules.d/01fips/module-setup.sh | 11 +++++------
- modules.d/40network/module-setup.sh | 9 ++-------
- modules.d/80cms/module-setup.sh | 4 +---
- modules.d/90dm/module-setup.sh | 4 +---
- modules.d/90dmraid/module-setup.sh | 4 +---
- modules.d/90lvm/module-setup.sh | 4 +---
- modules.d/90multipath/module-setup.sh | 6 ++++--
- modules.d/95nfs/module-setup.sh | 6 +-----
- modules.d/95udev-rules/module-setup.sh | 4 +---
- modules.d/98syslog/module-setup.sh | 8 +++-----
+ dracut-functions.sh | 28 ++++++++++++++++++++++++++++
+ dracut.sh | 12 ++++++++++--
+ modules.d/01fips/module-setup.sh | 11 +++++------
+ modules.d/40network/module-setup.sh | 9 ++-------
+ modules.d/80cms/module-setup.sh | 4 +---
+ modules.d/90dm/module-setup.sh | 4 +---
+ modules.d/90dmraid/module-setup.sh | 4 +---
+ modules.d/90lvm/module-setup.sh | 4 +---
+ modules.d/90multipath/module-setup.sh | 6 ++++--
+ modules.d/95nfs/module-setup.sh | 6 +-----
+ modules.d/95udev-rules/module-setup.sh | 4 +---
+ modules.d/98syslog/module-setup.sh | 8 +++-----
12 files changed, 58 insertions(+), 42 deletions(-)
diff --git a/dracut-functions.sh b/dracut-functions.sh
diff --git a/0008-dracut.sh-log-installed-modules-to-initdir-lib-dracu.patch b/0008-dracut.sh-log-installed-modules-to-initdir-lib-dracu.patch
index b7f7224..1673ecf 100644
--- a/0008-dracut.sh-log-installed-modules-to-initdir-lib-dracu.patch
+++ b/0008-dracut.sh-log-installed-modules-to-initdir-lib-dracu.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut.sh: log installed modules to
$initdir/lib/dracut/modules.txt
---
- dracut.sh | 5 +++++
+ dracut.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dracut.sh b/dracut.sh
diff --git a/0009-lvm-disable-lvmetad.patch b/0009-lvm-disable-lvmetad.patch
index 492b151..776e193 100644
--- a/0009-lvm-disable-lvmetad.patch
+++ b/0009-lvm-disable-lvmetad.patch
@@ -18,8 +18,8 @@ Falling back to internal scanning.
modules.d/90lvm/module-setup.sh | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
---
- modules.d/90lvm/lvm_scan.sh | 2 ++
- modules.d/90lvm/module-setup.sh | 1 +
+ modules.d/90lvm/lvm_scan.sh | 2 ++
+ modules.d/90lvm/module-setup.sh | 1 +
2 files changed, 3 insertions(+)
diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
diff --git a/0010-udev-rules-remove-01-ignore.rules.patch b/0010-udev-rules-remove-01-ignore.rules.patch
index ee21461..868be39 100644
--- a/0010-udev-rules-remove-01-ignore.rules.patch
+++ b/0010-udev-rules-remove-01-ignore.rules.patch
@@ -4,8 +4,8 @@ Date: Mon, 16 Apr 2012 14:50:35 +0200
Subject: [PATCH] udev-rules: remove 01-ignore.rules
---
- modules.d/95udev-rules/01-ignore.rules | 1 -
- modules.d/95udev-rules/module-setup.sh | 3 ---
+ modules.d/95udev-rules/01-ignore.rules | 1 -
+ modules.d/95udev-rules/module-setup.sh | 3 ---
2 files changed, 4 deletions(-)
delete mode 100644 modules.d/95udev-rules/01-ignore.rules
diff --git a/0011-lsinitrd-support-symlinks.patch b/0011-lsinitrd-support-symlinks.patch
index 683558e..bc2fefe 100644
--- a/0011-lsinitrd-support-symlinks.patch
+++ b/0011-lsinitrd-support-symlinks.patch
@@ -4,7 +4,7 @@ Date: Tue, 17 Apr 2012 11:31:27 +0200
Subject: [PATCH] lsinitrd: support symlinks
---
- lsinitrd.sh | 2 +-
+ lsinitrd.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lsinitrd.sh b/lsinitrd.sh
diff --git a/0012-dracut.cmdline.7.asc-document-resume-option.patch b/0012-dracut.cmdline.7.asc-document-resume-option.patch
index b64e907..966f24e 100644
--- a/0012-dracut.cmdline.7.asc-document-resume-option.patch
+++ b/0012-dracut.cmdline.7.asc-document-resume-option.patch
@@ -4,7 +4,7 @@ Date: Tue, 17 Apr 2012 12:06:51 +0200
Subject: [PATCH] dracut.cmdline.7.asc: document "resume=" option
---
- dracut.cmdline.7.asc | 11 +++++++++++
+ dracut.cmdline.7.asc | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
diff --git a/0013-dracut.spec-do-not-include-IMA-and-selinux-modules-w.patch b/0013-dracut.spec-do-not-include-IMA-and-selinux-modules-w.patch
index c142928..81eaac2 100644
--- a/0013-dracut.spec-do-not-include-IMA-and-selinux-modules-w.patch
+++ b/0013-dracut.spec-do-not-include-IMA-and-selinux-modules-w.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut.spec: do not include IMA and selinux modules with
systemd
---
- dracut.spec | 16 +++++++++++++---
+ dracut.spec | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/dracut.spec b/dracut.spec
diff --git a/0014-Do-not-run-plymouth-hook-if-the-binary-is-missing.patch b/0014-Do-not-run-plymouth-hook-if-the-binary-is-missing.patch
index edcb728..f9343bd 100644
--- a/0014-Do-not-run-plymouth-hook-if-the-binary-is-missing.patch
+++ b/0014-Do-not-run-plymouth-hook-if-the-binary-is-missing.patch
@@ -7,7 +7,7 @@ There is a remove-boot-splash script in Mageia that can
strip plymouth from an initrd. Make this script a noop
if that has happened.
---
- modules.d/50plymouth/plymouth-pretrigger.sh | 44 ++++++++++++++-------------
+ modules.d/50plymouth/plymouth-pretrigger.sh | 44 +++++++++++++++--------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
diff --git a/0015-man-Fix-add-fstab-option-in-man-page.patch b/0015-man-Fix-add-fstab-option-in-man-page.patch
index 5fc2460..dd567d9 100644
--- a/0015-man-Fix-add-fstab-option-in-man-page.patch
+++ b/0015-man-Fix-add-fstab-option-in-man-page.patch
@@ -4,7 +4,7 @@ Date: Sat, 14 Apr 2012 18:14:29 +0100
Subject: [PATCH] man: Fix --add-fstab option in man page
---
- dracut.8.asc | 2 +-
+ dracut.8.asc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut.8.asc b/dracut.8.asc
diff --git a/0016-base-init.sh-mount-tmpfs-with-strictatime.patch b/0016-base-init.sh-mount-tmpfs-with-strictatime.patch
index bd22ed7..e64e831 100644
--- a/0016-base-init.sh-mount-tmpfs-with-strictatime.patch
+++ b/0016-base-init.sh-mount-tmpfs-with-strictatime.patch
@@ -4,7 +4,7 @@ Date: Wed, 18 Apr 2012 12:44:00 +0200
Subject: [PATCH] base/init.sh: mount tmpfs with strictatime
---
- modules.d/99base/init.sh | 6 +++---
+ modules.d/99base/init.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
diff --git a/0017-99shutdown-shutdown.sh-export-PATH.patch b/0017-99shutdown-shutdown.sh-export-PATH.patch
index c162520..8e5ff94 100644
--- a/0017-99shutdown-shutdown.sh-export-PATH.patch
+++ b/0017-99shutdown-shutdown.sh-export-PATH.patch
@@ -4,7 +4,7 @@ Date: Wed, 18 Apr 2012 13:08:12 +0200
Subject: [PATCH] 99shutdown/shutdown.sh: export PATH
---
- modules.d/99shutdown/shutdown.sh | 5 ++---
+ modules.d/99shutdown/shutdown.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
diff --git a/0018-Makefile-do-not-install-systemd-service-in-reboot.patch b/0018-Makefile-do-not-install-systemd-service-in-reboot.patch
index 5259d79..684d372 100644
--- a/0018-Makefile-do-not-install-systemd-service-in-reboot.patch
+++ b/0018-Makefile-do-not-install-systemd-service-in-reboot.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Makefile: do not install systemd service in reboot
shutdown is enough. It is pulled in on reboot.
---
- Makefile | 3 ---
+ Makefile | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Makefile b/Makefile
diff --git a/0019-network-module-setup.sh-include-all-kernel-drivers-n.patch b/0019-network-module-setup.sh-include-all-kernel-drivers-n.patch
index c011821..400f24e 100644
--- a/0019-network-module-setup.sh-include-all-kernel-drivers-n.patch
+++ b/0019-network-module-setup.sh-include-all-kernel-drivers-n.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] network/module-setup.sh: include all kernel/drivers/net/phy
drivers
---
- modules.d/40network/module-setup.sh | 1 +
+ modules.d/40network/module-setup.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
diff --git a/0020-add-pre-pivot-cleanup-hook.patch b/0020-add-pre-pivot-cleanup-hook.patch
index e686e23..9c18401 100644
--- a/0020-add-pre-pivot-cleanup-hook.patch
+++ b/0020-add-pre-pivot-cleanup-hook.patch
@@ -12,11 +12,11 @@ that means pre-pivot hook is splited to two hooks pre-pivot and pre-pivot-cleanu
Signed-off-by: Dave Young <dyoung at redhat.com>
---
- README.modules | 3 +++
- dracut-functions.sh | 2 +-
- dracut.asc | 7 ++++++-
- dracut.cmdline.7.asc | 2 +-
- modules.d/99base/init.sh | 7 ++++++-
+ README.modules | 3 +++
+ dracut-functions.sh | 2 +-
+ dracut.asc | 7 ++++++-
+ dracut.cmdline.7.asc | 2 +-
+ modules.d/99base/init.sh | 7 ++++++-
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/README.modules b/README.modules
diff --git a/0021-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch b/0021-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
index 33c0294..0a03422 100644
--- a/0021-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
+++ b/0021-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
@@ -12,11 +12,11 @@ below cleanup scripts is moved:
Signed-off-by: Dave Young <dyoung at redhat.com>
---
- modules.d/40network/module-setup.sh | 2 +-
- modules.d/90crypt/module-setup.sh | 2 +-
- modules.d/90multipath/module-setup.sh | 2 +-
- modules.d/95iscsi/module-setup.sh | 2 +-
- modules.d/95nfs/module-setup.sh | 2 +-
+ modules.d/40network/module-setup.sh | 2 +-
+ modules.d/90crypt/module-setup.sh | 2 +-
+ modules.d/90multipath/module-setup.sh | 2 +-
+ modules.d/95iscsi/module-setup.sh | 2 +-
+ modules.d/95nfs/module-setup.sh | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
diff --git a/0022-network-parse-ip-opts.sh-remove-check-for-netroot.patch b/0022-network-parse-ip-opts.sh-remove-check-for-netroot.patch
index 88aefc3..824a966 100644
--- a/0022-network-parse-ip-opts.sh-remove-check-for-netroot.patch
+++ b/0022-network-parse-ip-opts.sh-remove-check-for-netroot.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] network/parse-ip-opts.sh: remove check for netroot
with anaconda and all other kind of stuff, we might want network, even
for root not on the network
---
- modules.d/40network/parse-ip-opts.sh | 8 --------
+ modules.d/40network/parse-ip-opts.sh | 8 --------
1 file changed, 8 deletions(-)
diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
diff --git a/0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch b/0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
index e803f06..4dfbcce 100644
--- a/0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
+++ b/0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
@@ -10,7 +10,7 @@ into the ifcfg file.
Thanks to Mark Hamzy <hamzy at us.ibm.com>
and Will Woods <wwoods at redhat.com> for the patch.
---
- modules.d/45ifcfg/write-ifcfg.sh | 5 +++++
+ modules.d/45ifcfg/write-ifcfg.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
diff --git a/0024-url-lib-don-t-add-existing-handlers-multiple-times.patch b/0024-url-lib-don-t-add-existing-handlers-multiple-times.patch
index 4bda97a..7e6f7ee 100644
--- a/0024-url-lib-don-t-add-existing-handlers-multiple-times.patch
+++ b/0024-url-lib-don-t-add-existing-handlers-multiple-times.patch
@@ -10,7 +10,7 @@ that already exist.
Note that this means you'll have to manipulate the handler list yourself
if you want to change the position/priority of existing handlers.
---
- modules.d/45url-lib/url-lib.sh | 1 +
+ modules.d/45url-lib/url-lib.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
diff --git a/0025-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch b/0025-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch
index 3c5ddef..1c1a0ac 100644
--- a/0025-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch
+++ b/0025-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch
@@ -11,7 +11,7 @@ that's reasonable on terminals where '\r' doesn't work.
See also: https://bugzilla.redhat.com/show_bug.cgi?id=814713
---
- modules.d/45url-lib/url-lib.sh | 7 ++++++-
+ modules.d/45url-lib/url-lib.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
diff --git a/0026-iscsi-module-setup.sh-fix-host-only-mount-checks.patch b/0026-iscsi-module-setup.sh-fix-host-only-mount-checks.patch
index e6a67e5..3431df1 100644
--- a/0026-iscsi-module-setup.sh-fix-host-only-mount-checks.patch
+++ b/0026-iscsi-module-setup.sh-fix-host-only-mount-checks.patch
@@ -4,7 +4,7 @@ Date: Wed, 25 Apr 2012 11:23:10 +0200
Subject: [PATCH] iscsi/module-setup.sh: fix host-only/mount checks
---
- modules.d/95iscsi/module-setup.sh | 16 ++++++----------
+ modules.d/95iscsi/module-setup.sh | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
diff --git a/0027-multipath-module-setup.sh-fix-host-only-mount-checks.patch b/0027-multipath-module-setup.sh-fix-host-only-mount-checks.patch
index 65962c1..9545dba 100644
--- a/0027-multipath-module-setup.sh-fix-host-only-mount-checks.patch
+++ b/0027-multipath-module-setup.sh-fix-host-only-mount-checks.patch
@@ -4,7 +4,7 @@ Date: Wed, 25 Apr 2012 11:23:49 +0200
Subject: [PATCH] multipath/module-setup.sh: fix host-only/mount checks
---
- modules.d/90multipath/module-setup.sh | 16 +++++++---------
+ modules.d/90multipath/module-setup.sh | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
diff --git a/0028-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch b/0028-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
index 30ffee1..df12808 100644
--- a/0028-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
+++ b/0028-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
@@ -12,7 +12,7 @@ This is a serious problem if you have (e.g.) "ip=eth0:dhcp" in
"ip=eth0:dhcp ip=eth0:dhcp" and then parse-ip-opts.sh will die() because
you have two configurations for eth0.
---
- modules.d/99base/dracut-lib.sh | 1 +
+ modules.d/99base/dracut-lib.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
diff --git a/0029-ifcfg-fix-resolv.conf.patch b/0029-ifcfg-fix-resolv.conf.patch
index 40a9e09..4ffd9b9 100644
--- a/0029-ifcfg-fix-resolv.conf.patch
+++ b/0029-ifcfg-fix-resolv.conf.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ifcfg: fix resolv.conf
/etc/net.*.resolv.conf is not a useful filename; copy it to resolv.conf
---
- modules.d/45ifcfg/write-ifcfg.sh | 2 +-
+ modules.d/45ifcfg/write-ifcfg.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
diff --git a/0030-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch b/0030-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch
index d5ef402..d7c0354 100644
--- a/0030-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch
+++ b/0030-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch
@@ -5,8 +5,8 @@ Subject: [PATCH] TEST-15-BTRFSRAID: add one more partition to the btrfs
raid10
---
- test/TEST-15-BTRFSRAID/create-root.sh | 12 +++++++++---
- test/TEST-15-BTRFSRAID/test.sh | 2 +-
+ test/TEST-15-BTRFSRAID/create-root.sh | 12 +++++++++---
+ test/TEST-15-BTRFSRAID/test.sh | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh
diff --git a/0031-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch b/0031-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch
index 76f0b84..b1af870 100644
--- a/0031-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch
+++ b/0031-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ifcfg/write-ifcfg.sh: use PREFIX for prefix netmask form
https://bugzilla.redhat.com/show_bug.cgi?id=820185
---
- modules.d/45ifcfg/write-ifcfg.sh | 6 +++++-
+ modules.d/45ifcfg/write-ifcfg.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
diff --git a/0032-Fail-to-boot-if-mediacheck-fails-817419.patch b/0032-Fail-to-boot-if-mediacheck-fails-817419.patch
index e50e0ba..d294852 100644
--- a/0032-Fail-to-boot-if-mediacheck-fails-817419.patch
+++ b/0032-Fail-to-boot-if-mediacheck-fails-817419.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fail to boot if mediacheck fails (#817419)
The return value of checkisomd5 was being ignored.
---
- modules.d/90dmsquash-live/dmsquash-live-root.sh | 2 +-
+ modules.d/90dmsquash-live/dmsquash-live-root.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
diff --git a/0033-ifcfg-write-ifcfg.sh-add-s390-specific-configuration.patch b/0033-ifcfg-write-ifcfg.sh-add-s390-specific-configuration.patch
index b1198ee..670e2ef 100644
--- a/0033-ifcfg-write-ifcfg.sh-add-s390-specific-configuration.patch
+++ b/0033-ifcfg-write-ifcfg.sh-add-s390-specific-configuration.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ifcfg/write-ifcfg.sh: add s390 specific configuration
https://bugzilla.redhat.com/show_bug.cgi?id=811521
---
- modules.d/45ifcfg/write-ifcfg.sh | 70 ++++++++++++++++++++++++++++++++++++--
+ modules.d/45ifcfg/write-ifcfg.sh | 70 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 68 insertions(+), 2 deletions(-)
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
diff --git a/0034-Makefile-call-git2spec.pl-with-LANG-C.patch b/0034-Makefile-call-git2spec.pl-with-LANG-C.patch
index ed7d521..769a0cd 100644
--- a/0034-Makefile-call-git2spec.pl-with-LANG-C.patch
+++ b/0034-Makefile-call-git2spec.pl-with-LANG-C.patch
@@ -4,7 +4,7 @@ Date: Thu, 10 May 2012 14:30:31 +0200
Subject: [PATCH] Makefile: call git2spec.pl with LANG=C
---
- Makefile | 2 +-
+ Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
diff --git a/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch b/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
index 5199d4a..b5f3df4 100644
--- a/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
+++ b/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ARM: make sure that we get the storage modules into the
initramfs
---
- modules.d/90kernel-modules/module-setup.sh | 3 +++
+ modules.d/90kernel-modules/module-setup.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
diff --git a/0036-Use-the-right-argument-for-dasd-module-options.patch b/0036-Use-the-right-argument-for-dasd-module-options.patch
index efaee90..838cd6b 100644
--- a/0036-Use-the-right-argument-for-dasd-module-options.patch
+++ b/0036-Use-the-right-argument-for-dasd-module-options.patch
@@ -7,7 +7,7 @@ The legacy argument is DASD=, and the new arguments should be the same
as the arguments for populating dasd.conf. If multiple arguments are
passed we can stack them by inserting a ',' between them.
---
- modules.d/95dasd_mod/parse-dasd-mod.sh | 18 +++++++++++++-----
+ modules.d/95dasd_mod/parse-dasd-mod.sh | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
diff --git a/0037-Translate-dasd-arg-contents-into-proper-dasd.conf.patch b/0037-Translate-dasd-arg-contents-into-proper-dasd.conf.patch
index a18e083..3d9338a 100644
--- a/0037-Translate-dasd-arg-contents-into-proper-dasd.conf.patch
+++ b/0037-Translate-dasd-arg-contents-into-proper-dasd.conf.patch
@@ -7,8 +7,8 @@ This uses a (new) s390utils utility to normalize the range we might get
in a dasd argument and generates a properly formatted output for
dasd.conf.
---
- modules.d/95dasd/module-setup.sh | 2 +-
- modules.d/95dasd/parse-dasd.sh | 4 ++--
+ modules.d/95dasd/module-setup.sh | 2 +-
+ modules.d/95dasd/parse-dasd.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/95dasd/module-setup.sh b/modules.d/95dasd/module-setup.sh
diff --git a/0038-Normalize-dasd-argument-content-for-dasd.conf.patch b/0038-Normalize-dasd-argument-content-for-dasd.conf.patch
index 674cf5a..968fe47 100644
--- a/0038-Normalize-dasd-argument-content-for-dasd.conf.patch
+++ b/0038-Normalize-dasd-argument-content-for-dasd.conf.patch
@@ -6,8 +6,8 @@ Subject: [PATCH] Normalize dasd argument content for dasd.conf
Also overwrite any existing files, contents from CMSCONFFILE override
any boot arguments.
---
- modules.d/80cms/cmssetup.sh | 4 ++--
- modules.d/80cms/module-setup.sh | 2 +-
+ modules.d/80cms/cmssetup.sh | 4 ++--
+ modules.d/80cms/module-setup.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
diff --git a/0039-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch b/0039-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch
index 39e94fe..db7609c 100644
--- a/0039-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch
+++ b/0039-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch
@@ -4,7 +4,7 @@ Date: Tue, 22 May 2012 11:36:41 +0200
Subject: [PATCH] ifcfg/write-ifcfg.sh: fixed IFS resetting
---
- modules.d/45ifcfg/write-ifcfg.sh | 6 ++++--
+ modules.d/45ifcfg/write-ifcfg.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
diff --git a/0040-Relax-the-rules-for-kdump-we-don-t-specify-netroot-i.patch b/0040-Relax-the-rules-for-kdump-we-don-t-specify-netroot-i.patch
index 00c56b1..81e1b9c 100644
--- a/0040-Relax-the-rules-for-kdump-we-don-t-specify-netroot-i.patch
+++ b/0040-Relax-the-rules-for-kdump-we-don-t-specify-netroot-i.patch
@@ -6,8 +6,8 @@ Subject: [PATCH] Relax the rules for kdump, we don't specify netroot in
https://bugzilla.redhat.com/show_bug.cgi?id=822750
---
- modules.d/40network/parse-bond.sh | 5 +----
- modules.d/40network/parse-bridge.sh | 3 ---
+ modules.d/40network/parse-bond.sh | 5 +----
+ modules.d/40network/parse-bridge.sh | 3 ---
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/modules.d/40network/parse-bond.sh b/modules.d/40network/parse-bond.sh
diff --git a/0041-url-lib-url-lib.sh-disable-curl-progress-bar.patch b/0041-url-lib-url-lib.sh-disable-curl-progress-bar.patch
index 7882507..b8588ae 100644
--- a/0041-url-lib-url-lib.sh-disable-curl-progress-bar.patch
+++ b/0041-url-lib-url-lib.sh-disable-curl-progress-bar.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] url-lib/url-lib.sh: disable curl progress bar
https://bugzilla.redhat.com/show_bug.cgi?id=817301
https://bugzilla.redhat.com/show_bug.cgi?id=824883
---
- modules.d/45url-lib/url-lib.sh | 4 ----
+ modules.d/45url-lib/url-lib.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
diff --git a/0042-network-ifup.sh-do-not-default-to-dhcp-for-interface.patch b/0042-network-ifup.sh-do-not-default-to-dhcp-for-interface.patch
index ebb7edb..673c48b 100644
--- a/0042-network-ifup.sh-do-not-default-to-dhcp-for-interface.patch
+++ b/0042-network-ifup.sh-do-not-default-to-dhcp-for-interface.patch
@@ -8,7 +8,7 @@ Don't try to be smarter than the admin configuring the machine.
Does also conflict with other methods trying to setup the interfaces,
like cmsifup.sh from the cms module.
---
- modules.d/40network/ifup.sh | 11 -----------
+ modules.d/40network/ifup.sh | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
diff --git a/0043-network-do-not-arping-with-qeth-layer3-interfaces.patch b/0043-network-do-not-arping-with-qeth-layer3-interfaces.patch
index 9cee18a..a889c28 100644
--- a/0043-network-do-not-arping-with-qeth-layer3-interfaces.patch
+++ b/0043-network-do-not-arping-with-qeth-layer3-interfaces.patch
@@ -5,8 +5,8 @@ Subject: [PATCH] network: do not arping with qeth layer3 interfaces
https://bugzilla.redhat.com/show_bug.cgi?id=825783
---
- modules.d/40network/dhclient-script.sh | 13 ++++++++++---
- modules.d/40network/net-lib.sh | 10 +++++++++-
+ modules.d/40network/dhclient-script.sh | 13 ++++++++++---
+ modules.d/40network/net-lib.sh | 10 +++++++++-
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
diff --git a/0044-dracut-shutdown.service-do-not-unpack-old-initramfs-.patch b/0044-dracut-shutdown.service-do-not-unpack-old-initramfs-.patch
index 572210d..2d73f45 100644
--- a/0044-dracut-shutdown.service-do-not-unpack-old-initramfs-.patch
+++ b/0044-dracut-shutdown.service-do-not-unpack-old-initramfs-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] dracut-shutdown.service: do not unpack old initramfs on
Do not unpack the initramfs, if the old initramfs still exists.
---
- dracut-shutdown.service | 1 +
+ dracut-shutdown.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/dracut-shutdown.service b/dracut-shutdown.service
diff --git a/0045-crypt-add-rd.luks.allow-discards-and-honor-options-i.patch b/0045-crypt-add-rd.luks.allow-discards-and-honor-options-i.patch
index d254676..548533e 100644
--- a/0045-crypt-add-rd.luks.allow-discards-and-honor-options-i.patch
+++ b/0045-crypt-add-rd.luks.allow-discards-and-honor-options-i.patch
@@ -6,8 +6,8 @@ Subject: [PATCH] crypt: add rd.luks.allow-discards and honor options in
also fixed the retry loop for rd.luks.key
---
- dracut.cmdline.7.asc | 10 +++++
- modules.d/90crypt/cryptroot-ask.sh | 73 ++++++++++++++++++++++++++++--------
+ dracut.cmdline.7.asc | 10 ++++++
+ modules.d/90crypt/cryptroot-ask.sh | 73 +++++++++++++++++++++++++++++---------
2 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
diff --git a/0046-dasd_mod-parse-dasd-mod.sh-fixed-dasd_mod-param-gene.patch b/0046-dasd_mod-parse-dasd-mod.sh-fixed-dasd_mod-param-gene.patch
index caacb4a..8fc118b 100644
--- a/0046-dasd_mod-parse-dasd-mod.sh-fixed-dasd_mod-param-gene.patch
+++ b/0046-dasd_mod-parse-dasd-mod.sh-fixed-dasd_mod-param-gene.patch
@@ -4,7 +4,7 @@ Date: Thu, 31 May 2012 09:12:51 +0200
Subject: [PATCH] dasd_mod/parse-dasd-mod.sh: fixed dasd_mod param generation
---
- modules.d/95dasd_mod/parse-dasd-mod.sh | 44 +++++++++++++++++++++++++++-----
+ modules.d/95dasd_mod/parse-dasd-mod.sh | 44 +++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 6 deletions(-)
diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
diff --git a/0047-fix-return-value-of-some-installkernel-functions.patch b/0047-fix-return-value-of-some-installkernel-functions.patch
index 4415b03..2aa7228 100644
--- a/0047-fix-return-value-of-some-installkernel-functions.patch
+++ b/0047-fix-return-value-of-some-installkernel-functions.patch
@@ -4,8 +4,8 @@ Date: Fri, 1 Jun 2012 17:09:25 +0200
Subject: [PATCH] fix return value of some installkernel() functions
---
- modules.d/40network/module-setup.sh | 3 +++
- modules.d/90multipath/module-setup.sh | 3 +++
+ modules.d/40network/module-setup.sh | 3 +++
+ modules.d/90multipath/module-setup.sh | 3 +++
2 files changed, 6 insertions(+)
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
diff --git a/0048-dracut.sh-do-not-rely-on-the-presence-of-lib64-check.patch b/0048-dracut.sh-do-not-rely-on-the-presence-of-lib64-check.patch
index 7ed6de7..f5c3484 100644
--- a/0048-dracut.sh-do-not-rely-on-the-presence-of-lib64-check.patch
+++ b/0048-dracut.sh-do-not-rely-on-the-presence-of-lib64-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut.sh: do not rely on the presence of lib64, check with
ldd
---
- dracut.sh | 27 +++++++++++++++++----------
+ dracut.sh | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/dracut.sh b/dracut.sh
diff --git a/0049-Don-t-set-an-already-set-attribute-826357.patch b/0049-Don-t-set-an-already-set-attribute-826357.patch
index da10513..fa939ac 100644
--- a/0049-Don-t-set-an-already-set-attribute-826357.patch
+++ b/0049-Don-t-set-an-already-set-attribute-826357.patch
@@ -8,7 +8,7 @@ already been marked as online or offline. We need to make the sysecho
sensitive to this and not fail if the attribute we're trying to set has
already been set.
---
- modules.d/80cms/cmssetup.sh | 8 ++++++--
+ modules.d/80cms/cmssetup.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
diff --git a/0050-add-filesystem-options-to-fsck_single.patch b/0050-add-filesystem-options-to-fsck_single.patch
index df5c036..9d10d73 100644
--- a/0050-add-filesystem-options-to-fsck_single.patch
+++ b/0050-add-filesystem-options-to-fsck_single.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] add filesystem options to fsck_single()
if we have e.g. special btrfs options for "/" and "/usr", we want to use
those for the test mount to determine if the filesystem is corrupted.
---
- modules.d/95fstab-sys/mount-sys.sh | 2 +-
- modules.d/95rootfs-block/mount-root.sh | 2 +-
- modules.d/98usrmount/mount-usr.sh | 5 +++--
- modules.d/99base/mount-hook.sh | 2 +-
- modules.d/99fs-lib/fs-lib.sh | 9 +++++----
+ modules.d/95fstab-sys/mount-sys.sh | 2 +-
+ modules.d/95rootfs-block/mount-root.sh | 2 +-
+ modules.d/98usrmount/mount-usr.sh | 5 +++--
+ modules.d/99base/mount-hook.sh | 2 +-
+ modules.d/99fs-lib/fs-lib.sh | 9 +++++----
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh
diff --git a/0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch b/0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch
index 6060eb8..06c26f7 100644
--- a/0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch
+++ b/0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch
@@ -4,8 +4,8 @@ Date: Tue, 5 Jun 2012 20:23:35 +0200
Subject: [PATCH] dasd_mod: change rd.dasd to dasd_mod kernel parameter
---
- dracut.cmdline.7.asc | 9 ++-------
- modules.d/95dasd_mod/parse-dasd-mod.sh | 34 --------------------------------
+ dracut.cmdline.7.asc | 9 ++-------
+ modules.d/95dasd_mod/parse-dasd-mod.sh | 34 ----------------------------------
2 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
diff --git a/0052-dracut.spec-remove-typo-from-BuildRequires-for-suse.patch b/0052-dracut.spec-remove-typo-from-BuildRequires-for-suse.patch
index 4520961..178b609 100644
--- a/0052-dracut.spec-remove-typo-from-BuildRequires-for-suse.patch
+++ b/0052-dracut.spec-remove-typo-from-BuildRequires-for-suse.patch
@@ -4,7 +4,7 @@ Date: Wed, 6 Jun 2012 10:24:07 +0200
Subject: [PATCH] dracut.spec: remove typo from BuildRequires for suse
---
- dracut.spec | 2 +-
+ dracut.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut.spec b/dracut.spec
diff --git a/0053-move-dracut-back-to-usr-share.patch b/0053-move-dracut-back-to-usr-share.patch
index f7f53ac..b52b01f 100644
--- a/0053-move-dracut-back-to-usr-share.patch
+++ b/0053-move-dracut-back-to-usr-share.patch
@@ -4,13 +4,13 @@ Date: Wed, 6 Jun 2012 10:58:13 +0200
Subject: [PATCH] move dracut back to /usr/share
---
- Makefile | 2 +-
- dracut-shutdown.service | 2 +-
- dracut.8.asc | 4 ++--
- dracut.asc | 4 ++--
- dracut.conf.5.asc | 2 +-
- dracut.sh | 8 ++++----
- dracut.spec | 18 ++++++------------
+ Makefile | 2 +-
+ dracut-shutdown.service | 2 +-
+ dracut.8.asc | 4 ++--
+ dracut.asc | 4 ++--
+ dracut.conf.5.asc | 2 +-
+ dracut.sh | 8 ++++----
+ dracut.spec | 18 ++++++------------
7 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
diff --git a/0054-removed-setsid-and-util-linux-2.21-requirement.patch b/0054-removed-setsid-and-util-linux-2.21-requirement.patch
index 7b14e37..f57290f 100644
--- a/0054-removed-setsid-and-util-linux-2.21-requirement.patch
+++ b/0054-removed-setsid-and-util-linux-2.21-requirement.patch
@@ -4,9 +4,9 @@ Date: Wed, 6 Jun 2012 11:14:48 +0200
Subject: [PATCH] removed setsid and util-linux >= 2.21 requirement
---
- dracut.spec | 4 ++--
- modules.d/99base/dracut-lib.sh | 3 +--
- modules.d/99base/module-setup.sh | 2 +-
+ dracut.spec | 4 ++--
+ modules.d/99base/dracut-lib.sh | 3 +--
+ modules.d/99base/module-setup.sh | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dracut.spec b/dracut.spec
diff --git a/0055-dracut-shutdown.service-execute-before-shutdown.targ.patch b/0055-dracut-shutdown.service-execute-before-shutdown.targ.patch
new file mode 100644
index 0000000..01bca1a
--- /dev/null
+++ b/0055-dracut-shutdown.service-execute-before-shutdown.targ.patch
@@ -0,0 +1,23 @@
+From d8cfb55ed20c6658730fadeda9156121092747ef Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 27 Sep 2012 11:20:41 +0200
+Subject: [PATCH] dracut-shutdown.service: execute before shutdown.target
+
+https://bugzilla.redhat.com/show_bug.cgi?id=840120
+---
+ dracut-shutdown.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut-shutdown.service b/dracut-shutdown.service
+index 56e7b94..4a268ec 100644
+--- a/dracut-shutdown.service
++++ b/dracut-shutdown.service
+@@ -8,7 +8,7 @@
+ [Unit]
+ Description=Restore /run/initramfs
+ After=getty at tty1.service prefdm.service
+-Before=reboot.service
++Before=reboot.service shutdown.target
+ DefaultDependencies=no
+ ConditionPathExists=/run/initramfs/.need_shutdown
+ ConditionPathExists=!/run/initramfs/bin/sh
diff --git a/0056-dracut.sh-create-the-initramfs-non-world-readable.patch b/0056-dracut.sh-create-the-initramfs-non-world-readable.patch
new file mode 100644
index 0000000..7bf1c01
--- /dev/null
+++ b/0056-dracut.sh-create-the-initramfs-non-world-readable.patch
@@ -0,0 +1,24 @@
+From 7bd06ffd0e0107add80248c676c73778e1241abd Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 27 Sep 2012 10:18:29 +0200
+Subject: [PATCH] dracut.sh: create the initramfs non-world readable
+
+---
+ dracut.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 03807b8..3f15ccc 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -839,7 +839,9 @@ if strstr "$modules_loaded" " fips " && command -v prelink >/dev/null; then
+ done
+ fi
+
+-if ! ( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \
++rm -f "$outfile"
++dinfo "*** Creating image file ***"
++if ! ( umask 077; cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \
+ $compress > "$outfile"; ); then
+ dfatal "dracut: creation of $outfile failed"
+ exit 1
diff --git a/0057-mdraid-always-create-need_shutdown-if-we-have-assemb.patch b/0057-mdraid-always-create-need_shutdown-if-we-have-assemb.patch
new file mode 100644
index 0000000..52b90f2
--- /dev/null
+++ b/0057-mdraid-always-create-need_shutdown-if-we-have-assemb.patch
@@ -0,0 +1,60 @@
+From 600ba9bf57e542c4b25d410b806e402b57b83e27 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 14 Aug 2012 17:44:46 +0200
+Subject: [PATCH] mdraid: always create need_shutdown, if we have assembled a
+ raid
+
+---
+ modules.d/90mdraid/mdraid-cleanup.sh | 4 ++--
+ modules.d/90mdraid/mdraid-needshutdown.sh | 11 +++++++++++
+ modules.d/90mdraid/module-setup.sh | 1 +
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+ create mode 100755 modules.d/90mdraid/mdraid-needshutdown.sh
+
+diff --git a/modules.d/90mdraid/mdraid-cleanup.sh b/modules.d/90mdraid/mdraid-cleanup.sh
+index 9c4bc18..da86d65 100755
+--- a/modules.d/90mdraid/mdraid-cleanup.sh
++++ b/modules.d/90mdraid/mdraid-cleanup.sh
+@@ -14,11 +14,11 @@ for md in /dev/md[0-9_]*; do
+ containers="$containers $md"
+ continue
+ fi
+- mdadm $_offroot -S "$md" >/dev/null 2>&1 || need_shutdown
++ mdadm $_offroot -S "$md" >/dev/null 2>&1
+ done
+
+ for md in $containers; do
+- mdadm $_offroot -S "$md" >/dev/null 2>&1 || need_shutdown
++ mdadm $_offroot -S "$md" >/dev/null 2>&1
+ done
+
+ unset containers udevinfo _offroot
+diff --git a/modules.d/90mdraid/mdraid-needshutdown.sh b/modules.d/90mdraid/mdraid-needshutdown.sh
+new file mode 100755
+index 0000000..79f9852
+--- /dev/null
++++ b/modules.d/90mdraid/mdraid-needshutdown.sh
+@@ -0,0 +1,11 @@
++#!/bin/sh
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
++
++type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
++
++for md in /dev/md[0-9_]*; do
++ [ -b "$md" ] || continue
++ need_shutdown
++ break
++done
+diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
+index 90092a7..1cf25e4 100755
+--- a/modules.d/90mdraid/module-setup.sh
++++ b/modules.d/90mdraid/module-setup.sh
+@@ -94,6 +94,7 @@ install() {
+ inst_hook pre-trigger 30 "$moddir/parse-md.sh"
+ inst_hook pre-mount 10 "$moddir/mdraid-waitclean.sh"
+ inst "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
++ inst_hook cleanup 99 "$moddir/mdraid-needshutdown.sh"
+ inst_hook shutdown 30 "$moddir/md-shutdown.sh"
+ }
+
diff --git a/0058-mdraid-catch-nested-md-raids.patch b/0058-mdraid-catch-nested-md-raids.patch
new file mode 100644
index 0000000..ddfc9c0
--- /dev/null
+++ b/0058-mdraid-catch-nested-md-raids.patch
@@ -0,0 +1,27 @@
+From 12eec3dc5a02d33de9d3827ed1508eaa4c527683 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 22 Aug 2012 13:01:53 +0200
+Subject: [PATCH] mdraid: catch nested md raids
+
+Thanks to Ian Dall!
+---
+ modules.d/90mdraid/65-md-incremental-imsm.rules | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
+index c4334db..d66dd01 100644
+--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
++++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
+@@ -5,7 +5,11 @@
+ ACTION!="add|change", GOTO="md_end"
+ SUBSYSTEM!="block", GOTO="md_end"
+ ENV{rd_NO_MD}=="?*", GOTO="md_end"
+-KERNEL=="md*", GOTO="md_end"
++KERNEL=="md*", ENV{ID_FS_TYPE}!="linux_raid_member", GOTO="md_end"
++KERNEL=="md*", ACTION!="change", GOTO="md_end"
++
++# Also don't process disks that are slated to be a multipath device
++ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end"
+
+ ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", GOTO="md_try"
+ GOTO="md_end"
diff --git a/0059-mdraid-md-shutdown.sh-wait-until-md-devices-are-clea.patch b/0059-mdraid-md-shutdown.sh-wait-until-md-devices-are-clea.patch
new file mode 100644
index 0000000..be4e372
--- /dev/null
+++ b/0059-mdraid-md-shutdown.sh-wait-until-md-devices-are-clea.patch
@@ -0,0 +1,34 @@
+From 7093b787f8499ad8fc7d77f02adb2d99a108d1c4 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 8 Jun 2012 10:28:31 +0200
+Subject: [PATCH] mdraid/md-shutdown.sh: wait until md devices are clean
+
+https://bugzilla.redhat.com/show_bug.cgi?id=732297
+---
+ modules.d/90mdraid/md-shutdown.sh | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/90mdraid/md-shutdown.sh b/modules.d/90mdraid/md-shutdown.sh
+index 0d41008..1e6c9f6 100755
+--- a/modules.d/90mdraid/md-shutdown.sh
++++ b/modules.d/90mdraid/md-shutdown.sh
+@@ -5,12 +5,15 @@ _do_md_shutdown() {
+ local ret
+ local final=$1
+ local _offroot=$(strstr "$(mdadm --help-options 2>&1)" offroot && echo --offroot)
+- info "Disassembling mdraid devices."
+- mdadm $_offroot -v --stop --scan
++ info "Waiting for mdraid devices to be clean."
++ mdadm $_offroot -vv --wait-clean --scan| vinfo
+ ret=$?
++ info "Disassembling mdraid devices."
++ mdadm $_offroot -vv --stop --scan | vinfo
++ ret=$(($ret+$?))
+ if [ "x$final" != "x" ]; then
+- info "cat /proc/mdstat"
+- cat /proc/mdstat | vinfo
++ info "/proc/mdstat:"
++ vinfo < /proc/mdstat
+ fi
+ return $ret
+ }
diff --git a/dracut.spec b/dracut.spec
index c477e79..1f2004c 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
Name: dracut
Version: 018
-Release: 55.git20120606%{?dist}
+Release: 60.git20120927%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -78,6 +78,11 @@ Patch51: 0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch
Patch52: 0052-dracut.spec-remove-typo-from-BuildRequires-for-suse.patch
Patch53: 0053-move-dracut-back-to-usr-share.patch
Patch54: 0054-removed-setsid-and-util-linux-2.21-requirement.patch
+Patch55: 0055-dracut-shutdown.service-execute-before-shutdown.targ.patch
+Patch56: 0056-dracut.sh-create-the-initramfs-non-world-readable.patch
+Patch57: 0057-mdraid-always-create-need_shutdown-if-we-have-assemb.patch
+Patch58: 0058-mdraid-catch-nested-md-raids.patch
+Patch59: 0059-mdraid-md-shutdown.sh-wait-until-md-devices-are-clea.patch
BuildArch: noarch
@@ -387,6 +392,16 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Thu Sep 27 2012 Harald Hoyer <harald at redhat.com> 018-60.git20120927
+- run dracut-shutdown.service before shutdown.target
+Resolves: rhbz#840120
+- do not create the initramfs world readable
+Resolves: rhbz#859448
+- mdraid: do the dracut shutdown, if a md raid is found
+- mdraid: handle nested md raids
+- mdraid: wait until devices are clean on shutdown
+Resolves: rhbz#732297 rhbz#840562
+
* Wed Jun 06 2012 Harald Hoyer <harald at redhat.com> 018-55.git20120606
- update to F17 version
- support for /usr mounting in the initramfs
More information about the scm-commits
mailing list