[dracut/f17] dracut-018-93.git20120719
Harald Hoyer
harald at fedoraproject.org
Thu Jul 19 11:52:01 UTC 2012
commit aa4903630dce66469e8828ac380107e2b29d56b7
Author: Harald Hoyer <harald at redhat.com>
Date: Thu Jul 19 13:23:39 2012 +0200
dracut-018-93.git20120719
- do not rename network interfaces
- wait until md raids are clean on shutdown
- fips module fixes
- fixed BOOTIF case sensitive
- fixed resume from hibernate
- nfs module fixes
...-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 +-
0010-virtfs-root-filesystem-support.patch | 169 -------------------
0011-lsinitrd-support-symlinks.patch | 2 +-
0011-udev-rules-remove-01-ignore.rules.patch | 32 ----
...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 +-
...les-module-setup.sh-include-omapdrm-in-th.patch | 2 +-
...etwork-ifup.sh-default-to-dhcp-for-BOOTIF.patch | 2 +-
...etwork-ifup.sh-default-to-dhcp-for-BOOTIF.patch | 2 +-
...ork-ifup.sh-do-not-default-to-dhcp-for-in.patch | 2 +-
...flict-between-cms-network-rules-and-defau.patch | 4 +-
0058-Add-vlan-support-in-network-module.patch | 8 +-
0059-Add-doc-for-vlan-cmdline.patch | 2 +-
0060-Add-doc-for-bond-cmdline.patch | 2 +-
0061-Add-doc-for-birdge-cmdline.patch | 2 +-
...re-that-we-get-the-storage-modules-into-t.patch | 27 ---
...e-multiple-underlying-devices-of-a-bridge.patch | 8 +-
...-lib.sh-use-silent-mode-for-curl-if-TERM-.patch | 2 +-
...functions-fixed-return-status-of-instmods.patch | 4 +-
0065-network-support-vlan-tagged-bonding.patch | 4 +-
...down.service-fixed-ordering-to-be-before-.patch | 2 +-
...dule-setup.sh-speedup-install-of-all-term.patch | 2 +-
...ule-setup.sh-fixed-installkernel-return-c.patch | 2 +-
...csi-module-setup.sh-speedup-installkernel.patch | 2 +-
...ib.sh-removed-test-mounting-of-btrfs-and-.patch | 2 +-
...-setup.sh-install_all_kbd-speedup-install.patch | 2 +-
0072-no-more-mknod-in-the-initramfs.patch | 6 +-
...ut.sh-precopy-some-essential-device-nodes.patch | 2 +-
0074-dracut.sh-mkdir-initdir-lib-dracut.patch | 2 +-
...odule-setup.sh-installkernel-fix-return-c.patch | 2 +-
...t.sh-do-not-copy-devices-nodes-mknod-them.patch | 2 +-
...-setup.sh-do-not-install-systemd-vconsole.patch | 2 +-
...ame-genrules.sh-no-rule-to-rename-other-i.patch | 30 ++++
...hutdown.sh-wait-until-md-devices-are-clea.patch | 33 ++++
0080-fips-module-setup.sh-s-aes-xts-xts.patch | 22 +++
0081-fips-change-module-list.patch | 22 +++
0082-fips-fixed-module-list.patch | 22 +++
0083-Fix-fips-module-list.patch | 42 +++++
0084-98usrmount-depend-on-fs-lib.patch | 22 +++
...ostonly-mode-generates-host-specific-conf.patch | 41 +++++
...OTIF-for-converting-mac-addr-to-lowercase.patch | 38 ++++
0087-modules.d-get-rid-of-tr.patch | 178 ++++++++++++++++++++
...tions.sh-set-LC_ALL-C-to-get-correct-pars.patch | 23 +++
0089-resume-move-resume-process-to-initqueue.patch | 63 +++++++
...les-module-setup.sh-also-install-lib-modp.patch | 25 +++
0091-nfs-install-modprobe-config-file.patch | 60 +++++++
...s-module-setup.sh-cope-with-systemd-udevd.patch | 21 +++
dracut.spec | 25 +++-
96 files changed, 790 insertions(+), 353 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-kernel-modules-module-setup.sh-include-omapdrm-in-th.patch b/0053-kernel-modules-module-setup.sh-include-omapdrm-in-th.patch
index 9634188..3972936 100644
--- a/0053-kernel-modules-module-setup.sh-include-omapdrm-in-th.patch
+++ b/0053-kernel-modules-module-setup.sh-include-omapdrm-in-th.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] kernel-modules/module-setup.sh: include omapdrm in the arm
modules to include
---
- modules.d/90kernel-modules/module-setup.sh | 2 +-
+ modules.d/90kernel-modules/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
diff --git a/0054-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch b/0054-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch
index 9af619d..f99ab38 100644
--- a/0054-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch
+++ b/0054-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch
@@ -4,7 +4,7 @@ Date: Mon, 11 Jun 2012 17:11:49 +0200
Subject: [PATCH] network/ifup.sh: default to dhcp for BOOTIF
---
- modules.d/40network/ifup.sh | 7 +++++++
+ modules.d/40network/ifup.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
diff --git a/0055-Revert-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch b/0055-Revert-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch
index 769478c..786bddc 100644
--- a/0055-Revert-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch
+++ b/0055-Revert-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Revert "network/ifup.sh: default to dhcp for BOOTIF"
This reverts commit 4d0cefe6684c33a4d260ab58bf69cafa20e3778d.
---
- modules.d/40network/ifup.sh | 7 -------
+ modules.d/40network/ifup.sh | 7 -------
1 file changed, 7 deletions(-)
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
diff --git a/0056-Revert-network-ifup.sh-do-not-default-to-dhcp-for-in.patch b/0056-Revert-network-ifup.sh-do-not-default-to-dhcp-for-in.patch
index 5a45a16..88733f4 100644
--- a/0056-Revert-network-ifup.sh-do-not-default-to-dhcp-for-in.patch
+++ b/0056-Revert-network-ifup.sh-do-not-default-to-dhcp-for-in.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Revert "network/ifup.sh: do not default to dhcp, for
This reverts commit 588f0347536f3668708131353b2cb01f21594b59.
---
- modules.d/40network/ifup.sh | 11 +++++++++++
+ modules.d/40network/ifup.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
diff --git a/0057-resolve-conflict-between-cms-network-rules-and-defau.patch b/0057-resolve-conflict-between-cms-network-rules-and-defau.patch
index f44a40e..f489f4e 100644
--- a/0057-resolve-conflict-between-cms-network-rules-and-defau.patch
+++ b/0057-resolve-conflict-between-cms-network-rules-and-defau.patch
@@ -4,8 +4,8 @@ Date: Tue, 12 Jun 2012 14:40:43 +0200
Subject: [PATCH] resolve conflict between cms network rules and default rules
---
- modules.d/40network/net-genrules.sh | 2 +-
- modules.d/80cms/cmssetup.sh | 2 ++
+ modules.d/40network/net-genrules.sh | 2 +-
+ modules.d/80cms/cmssetup.sh | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
diff --git a/0058-Add-vlan-support-in-network-module.patch b/0058-Add-vlan-support-in-network-module.patch
index 3e970c5..3712a5a 100644
--- a/0058-Add-vlan-support-in-network-module.patch
+++ b/0058-Add-vlan-support-in-network-module.patch
@@ -26,10 +26,10 @@ Signed-off-by: Cong Wang <xiyou.wangcong at gmail.com>
Conflicts:
modules.d/40network/ifup.sh
---
- modules.d/40network/ifup.sh | 29 ++++++++++++++++++++++
- modules.d/40network/module-setup.sh | 3 +++
- modules.d/40network/net-genrules.sh | 5 ++++
- modules.d/40network/parse-vlan.sh | 45 +++++++++++++++++++++++++++++++++++
+ modules.d/40network/ifup.sh | 29 ++++++++++++++++++++++++
+ modules.d/40network/module-setup.sh | 3 +++
+ modules.d/40network/net-genrules.sh | 5 +++++
+ modules.d/40network/parse-vlan.sh | 45 +++++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 modules.d/40network/parse-vlan.sh
diff --git a/0059-Add-doc-for-vlan-cmdline.patch b/0059-Add-doc-for-vlan-cmdline.patch
index d49f0ce..5fc81f0 100644
--- a/0059-Add-doc-for-vlan-cmdline.patch
+++ b/0059-Add-doc-for-vlan-cmdline.patch
@@ -10,7 +10,7 @@ Cc: Harald Hoyer <harald at redhat.com>
Cc: Vivek Goyal <vgoyal at redhat.com>
Signed-off-by: Cong Wang <xiyou.wangcong at gmail.com>
---
- dracut.cmdline.7.asc | 5 +++++
+ dracut.cmdline.7.asc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
diff --git a/0060-Add-doc-for-bond-cmdline.patch b/0060-Add-doc-for-bond-cmdline.patch
index 093a8cd..bf123d0 100644
--- a/0060-Add-doc-for-bond-cmdline.patch
+++ b/0060-Add-doc-for-bond-cmdline.patch
@@ -10,7 +10,7 @@ Cc: Dave Young <dyoung at redhat.com>
Cc: Vivek Goyal <vgoyal at redhat.com>
Signed-off-by: Cong Wang <xiyou.wangcong at gmail.com>
---
- dracut.cmdline.7.asc | 9 +++++++++
+ dracut.cmdline.7.asc | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
diff --git a/0061-Add-doc-for-birdge-cmdline.patch b/0061-Add-doc-for-birdge-cmdline.patch
index 00f7be4..28b688d 100644
--- a/0061-Add-doc-for-birdge-cmdline.patch
+++ b/0061-Add-doc-for-birdge-cmdline.patch
@@ -10,7 +10,7 @@ Cc: Dave Young <dyoung at redhat.com>
Cc: Vivek Goyal <vgoyal at redhat.com>
Signed-off-by: Cong Wang <xiyou.wangcong at gmail.com>
---
- dracut.cmdline.7.asc | 3 +++
+ dracut.cmdline.7.asc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
diff --git a/0062-Handle-multiple-underlying-devices-of-a-bridge.patch b/0062-Handle-multiple-underlying-devices-of-a-bridge.patch
index 9405afe..d9c7b72 100644
--- a/0062-Handle-multiple-underlying-devices-of-a-bridge.patch
+++ b/0062-Handle-multiple-underlying-devices-of-a-bridge.patch
@@ -15,10 +15,10 @@ Cc: Dave Young <dyoung at redhat.com>
Cc: Vivek Goyal <vgoyal at redhat.com>
Signed-off-by: Cong Wang <xiyou.wangcong at gmail.com>
---
- dracut.cmdline.7.asc | 5 +++--
- modules.d/40network/ifup.sh | 38 ++++++++++++++++++++---------------
- modules.d/40network/net-genrules.sh | 2 +-
- modules.d/40network/parse-bridge.sh | 17 ++++++++--------
+ dracut.cmdline.7.asc | 5 +++--
+ modules.d/40network/ifup.sh | 38 +++++++++++++++++++++----------------
+ modules.d/40network/net-genrules.sh | 2 +-
+ modules.d/40network/parse-bridge.sh | 17 +++++++++--------
4 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
diff --git a/0063-url-lib-url-lib.sh-use-silent-mode-for-curl-if-TERM-.patch b/0063-url-lib-url-lib.sh-use-silent-mode-for-curl-if-TERM-.patch
index 3a4f201..3b8f828 100644
--- a/0063-url-lib-url-lib.sh-use-silent-mode-for-curl-if-TERM-.patch
+++ b/0063-url-lib-url-lib.sh-use-silent-mode-for-curl-if-TERM-.patch
@@ -4,7 +4,7 @@ Date: Tue, 12 Jun 2012 15:00:08 +0200
Subject: [PATCH] url-lib/url-lib.sh: use silent mode for curl if TERM=dumb
---
- modules.d/45url-lib/url-lib.sh | 7 +++++++
+ modules.d/45url-lib/url-lib.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
diff --git a/0064-dracut-functions-fixed-return-status-of-instmods.patch b/0064-dracut-functions-fixed-return-status-of-instmods.patch
index 4c45baf..5e3781f 100644
--- a/0064-dracut-functions-fixed-return-status-of-instmods.patch
+++ b/0064-dracut-functions-fixed-return-status-of-instmods.patch
@@ -4,8 +4,8 @@ Date: Tue, 12 Jun 2012 11:06:58 -0400
Subject: [PATCH] dracut-functions: fixed return status of instmods()
---
- dracut-functions.sh | 24 ++++++++++++++++--------
- dracut.sh | 4 ++++
+ dracut-functions.sh | 24 ++++++++++++++++--------
+ dracut.sh | 4 ++++
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/dracut-functions.sh b/dracut-functions.sh
diff --git a/0065-network-support-vlan-tagged-bonding.patch b/0065-network-support-vlan-tagged-bonding.patch
index 3f5f4f5..322ae45 100644
--- a/0065-network-support-vlan-tagged-bonding.patch
+++ b/0065-network-support-vlan-tagged-bonding.patch
@@ -12,8 +12,8 @@ Cc: Dave Young <dyoung at redhat.com>
Cc: Vivek Goyal <vgoyal at redhat.com>
Signed-off-by: Cong Wang <xiyou.wangcong at gmail.com>
---
- modules.d/40network/ifup.sh | 8 ++++++--
- modules.d/40network/net-genrules.sh | 6 +++---
+ modules.d/40network/ifup.sh | 8 ++++++--
+ modules.d/40network/net-genrules.sh | 6 +++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
diff --git a/0066-dracut-shutdown.service-fixed-ordering-to-be-before-.patch b/0066-dracut-shutdown.service-fixed-ordering-to-be-before-.patch
index 1bb944f..387cc79 100644
--- a/0066-dracut-shutdown.service-fixed-ordering-to-be-before-.patch
+++ b/0066-dracut-shutdown.service-fixed-ordering-to-be-before-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut-shutdown.service: fixed ordering to be before
shutdown.target
---
- dracut-shutdown.service | 2 +-
+ dracut-shutdown.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-shutdown.service b/dracut-shutdown.service
diff --git a/0067-terminfo-module-setup.sh-speedup-install-of-all-term.patch b/0067-terminfo-module-setup.sh-speedup-install-of-all-term.patch
index 2180985..b7d20ac 100644
--- a/0067-terminfo-module-setup.sh-speedup-install-of-all-term.patch
+++ b/0067-terminfo-module-setup.sh-speedup-install-of-all-term.patch
@@ -4,7 +4,7 @@ Date: Fri, 22 Jun 2012 15:29:04 +0200
Subject: [PATCH] terminfo/module-setup.sh: speedup install() of all terminfo
---
- modules.d/95terminfo/module-setup.sh | 6 ++----
+ modules.d/95terminfo/module-setup.sh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/modules.d/95terminfo/module-setup.sh b/modules.d/95terminfo/module-setup.sh
diff --git a/0068-network-module-setup.sh-fixed-installkernel-return-c.patch b/0068-network-module-setup.sh-fixed-installkernel-return-c.patch
index cb579d1..23edec4 100644
--- a/0068-network-module-setup.sh-fixed-installkernel-return-c.patch
+++ b/0068-network-module-setup.sh-fixed-installkernel-return-c.patch
@@ -4,7 +4,7 @@ Date: Fri, 22 Jun 2012 15:24:28 +0200
Subject: [PATCH] network/module-setup.sh: fixed installkernel() return code
---
- modules.d/40network/module-setup.sh | 6 +++---
+ modules.d/40network/module-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
diff --git a/0069-iscsi-module-setup.sh-speedup-installkernel.patch b/0069-iscsi-module-setup.sh-speedup-installkernel.patch
index 9f0fca8..16f64c6 100644
--- a/0069-iscsi-module-setup.sh-speedup-installkernel.patch
+++ b/0069-iscsi-module-setup.sh-speedup-installkernel.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] iscsi/module-setup.sh: speedup installkernel()
Conflicts:
modules.d/95iscsi/module-setup.sh
---
- modules.d/95iscsi/module-setup.sh | 43 +++++++++++++++++++++++++++++--------
+ modules.d/95iscsi/module-setup.sh | 43 +++++++++++++++++++++++++++++++--------
1 file changed, 34 insertions(+), 9 deletions(-)
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
diff --git a/0070-fs-lib-fs-lib.sh-removed-test-mounting-of-btrfs-and-.patch b/0070-fs-lib-fs-lib.sh-removed-test-mounting-of-btrfs-and-.patch
index 22887fa..453f478 100644
--- a/0070-fs-lib-fs-lib.sh-removed-test-mounting-of-btrfs-and-.patch
+++ b/0070-fs-lib-fs-lib.sh-removed-test-mounting-of-btrfs-and-.patch
@@ -7,7 +7,7 @@ mount/umount check only costs time and we fail later anyway.
mount can take very long on large filesystems. Better fail on the real
mount.
---
- modules.d/99fs-lib/fs-lib.sh | 58 +++---------------------------------------
+ modules.d/99fs-lib/fs-lib.sh | 58 +++-----------------------------------------
1 file changed, 4 insertions(+), 54 deletions(-)
diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
diff --git a/0071-i18n-module-setup.sh-install_all_kbd-speedup-install.patch b/0071-i18n-module-setup.sh-install_all_kbd-speedup-install.patch
index 4327c6e..e21b313 100644
--- a/0071-i18n-module-setup.sh-install_all_kbd-speedup-install.patch
+++ b/0071-i18n-module-setup.sh-install_all_kbd-speedup-install.patch
@@ -4,7 +4,7 @@ Date: Fri, 22 Jun 2012 15:21:11 +0200
Subject: [PATCH] i18n/module-setup.sh:install_all_kbd(): speedup install
---
- modules.d/10i18n/module-setup.sh | 6 +++---
+ modules.d/10i18n/module-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
diff --git a/0072-no-more-mknod-in-the-initramfs.patch b/0072-no-more-mknod-in-the-initramfs.patch
index 9fff405..36f75fa 100644
--- a/0072-no-more-mknod-in-the-initramfs.patch
+++ b/0072-no-more-mknod-in-the-initramfs.patch
@@ -4,9 +4,9 @@ Date: Fri, 22 Jun 2012 15:27:40 +0200
Subject: [PATCH] no more "mknod" in the initramfs!!
---
- modules.d/50gensplash/gensplash-pretrigger.sh | 4 ----
- modules.d/50plymouth/plymouth-pretrigger.sh | 6 ------
- modules.d/99base/init.sh | 2 --
+ modules.d/50gensplash/gensplash-pretrigger.sh | 4 ----
+ modules.d/50plymouth/plymouth-pretrigger.sh | 6 ------
+ modules.d/99base/init.sh | 2 --
3 files changed, 12 deletions(-)
diff --git a/modules.d/50gensplash/gensplash-pretrigger.sh b/modules.d/50gensplash/gensplash-pretrigger.sh
diff --git a/0073-dracut.sh-precopy-some-essential-device-nodes.patch b/0073-dracut.sh-precopy-some-essential-device-nodes.patch
index 5d4e72b..242fa82 100644
--- a/0073-dracut.sh-precopy-some-essential-device-nodes.patch
+++ b/0073-dracut.sh-precopy-some-essential-device-nodes.patch
@@ -4,7 +4,7 @@ Date: Mon, 4 Jun 2012 14:00:49 +0200
Subject: [PATCH] dracut.sh: precopy some essential device nodes
---
- dracut.sh | 3 +++
+ dracut.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dracut.sh b/dracut.sh
diff --git a/0074-dracut.sh-mkdir-initdir-lib-dracut.patch b/0074-dracut.sh-mkdir-initdir-lib-dracut.patch
index 6a6fbda..1715f67 100644
--- a/0074-dracut.sh-mkdir-initdir-lib-dracut.patch
+++ b/0074-dracut.sh-mkdir-initdir-lib-dracut.patch
@@ -4,7 +4,7 @@ Date: Tue, 12 Jun 2012 11:35:49 -0400
Subject: [PATCH] dracut.sh: mkdir $initdir/lib/dracut
---
- dracut.sh | 5 ++++-
+ dracut.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dracut.sh b/dracut.sh
diff --git a/0075-multipath-module-setup.sh-installkernel-fix-return-c.patch b/0075-multipath-module-setup.sh-installkernel-fix-return-c.patch
index 5d27a64..3fe3d04 100644
--- a/0075-multipath-module-setup.sh-installkernel-fix-return-c.patch
+++ b/0075-multipath-module-setup.sh-installkernel-fix-return-c.patch
@@ -4,7 +4,7 @@ Date: Fri, 22 Jun 2012 15:33:15 +0200
Subject: [PATCH] multipath/module-setup.sh:installkernel() fix return code
---
- modules.d/90multipath/module-setup.sh | 43 ++++++++++++++++++++++++---------
+ modules.d/90multipath/module-setup.sh | 43 +++++++++++++++++++++++++----------
1 file changed, 31 insertions(+), 12 deletions(-)
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
diff --git a/0076-dracut.sh-do-not-copy-devices-nodes-mknod-them.patch b/0076-dracut.sh-do-not-copy-devices-nodes-mknod-them.patch
index f21a4a0..773e899 100644
--- a/0076-dracut.sh-do-not-copy-devices-nodes-mknod-them.patch
+++ b/0076-dracut.sh-do-not-copy-devices-nodes-mknod-them.patch
@@ -4,7 +4,7 @@ Date: Fri, 22 Jun 2012 15:49:25 +0200
Subject: [PATCH] dracut.sh: do not copy devices nodes, mknod them
---
- dracut.sh | 7 +++----
+ dracut.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dracut.sh b/dracut.sh
diff --git a/0077-i18n-module-setup.sh-do-not-install-systemd-vconsole.patch b/0077-i18n-module-setup.sh-do-not-install-systemd-vconsole.patch
index 6406092..64cfd93 100644
--- a/0077-i18n-module-setup.sh-do-not-install-systemd-vconsole.patch
+++ b/0077-i18n-module-setup.sh-do-not-install-systemd-vconsole.patch
@@ -4,7 +4,7 @@ Date: Fri, 22 Jun 2012 15:58:24 +0200
Subject: [PATCH] i18n/module-setup.sh: do not install systemd-vconsole-setup
---
- modules.d/10i18n/module-setup.sh | 2 +-
+ modules.d/10i18n/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
diff --git a/0078-network-ifname-genrules.sh-no-rule-to-rename-other-i.patch b/0078-network-ifname-genrules.sh-no-rule-to-rename-other-i.patch
new file mode 100644
index 0000000..aadbb20
--- /dev/null
+++ b/0078-network-ifname-genrules.sh-no-rule-to-rename-other-i.patch
@@ -0,0 +1,30 @@
+From 4758855031026ce0ea53205f045577b6011eda4e Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 5 Jul 2012 13:29:28 +0200
+Subject: [PATCH] network/ifname-genrules.sh: no rule to rename other
+ interfaces
+
+current udevd does it correctly now
+---
+ modules.d/40network/ifname-genrules.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/modules.d/40network/ifname-genrules.sh b/modules.d/40network/ifname-genrules.sh
+index e188c88..6f92848 100755
+--- a/modules.d/40network/ifname-genrules.sh
++++ b/modules.d/40network/ifname-genrules.sh
+@@ -13,9 +13,9 @@ fi
+ printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", NAME="%s"\n' "$ifname_mac" "$ifname_if"
+ done
+
+- # Rename non named interfaces out of the way for named ones.
+- for p in $(getargs ifname=); do
+- parse_ifname_opts $p
+- printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{type}=="1", NAME!="?*", KERNEL=="%s", NAME="%%k-renamed"\n' "$ifname_if"
+- done
++# Rename non named interfaces out of the way for named ones.
++#for p in $(getargs ifname=); do
++# parse_ifname_opts $p
++# printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*", ATTR{type}=="1", NAME!="?*", KERNEL=="%s", NAME="%%kren$attr{ifindex}"\n' "$ifname_if"
++# done
+ } > /etc/udev/rules.d/50-ifname.rules
diff --git a/0079-mdraid-md-shutdown.sh-wait-until-md-devices-are-clea.patch b/0079-mdraid-md-shutdown.sh-wait-until-md-devices-are-clea.patch
new file mode 100644
index 0000000..b801aca
--- /dev/null
+++ b/0079-mdraid-md-shutdown.sh-wait-until-md-devices-are-clea.patch
@@ -0,0 +1,33 @@
+From 89ca9048e25c56672a920db98cbd2ed37e2dae12 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
+
+---
+ 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/0080-fips-module-setup.sh-s-aes-xts-xts.patch b/0080-fips-module-setup.sh-s-aes-xts-xts.patch
new file mode 100644
index 0000000..d1b40e1
--- /dev/null
+++ b/0080-fips-module-setup.sh-s-aes-xts-xts.patch
@@ -0,0 +1,22 @@
+From dd0976f7fd98bfff31f03fefd4af577dd978559c Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 27 Jun 2012 17:00:54 +0200
+Subject: [PATCH] fips/module-setup.sh: s/aes-xts/xts
+
+---
+ modules.d/01fips/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 6bfe31e..e389e80 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -12,7 +12,7 @@ depends() {
+
+ installkernel() {
+ local _fipsmodules _mod
+- _fipsmodules="aead aes_generic aes-xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
++ _fipsmodules="aead aes_generic xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
+ _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256 sha512"
+ _fipsmodules+=" cryptomgr crypto_null tcrypt dm-mod dm-crypt"
+
diff --git a/0081-fips-change-module-list.patch b/0081-fips-change-module-list.patch
new file mode 100644
index 0000000..bee06fe
--- /dev/null
+++ b/0081-fips-change-module-list.patch
@@ -0,0 +1,22 @@
+From 29ca8710b4f36822a50fe920b0355c9536039456 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 5 Jul 2012 10:11:27 +0200
+Subject: [PATCH] fips: change module list
+
+---
+ modules.d/01fips/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index e389e80..8d1dace 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -13,7 +13,7 @@ depends() {
+ installkernel() {
+ local _fipsmodules _mod
+ _fipsmodules="aead aes_generic xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
+- _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256 sha512"
++ _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256_generic sha512"
+ _fipsmodules+=" cryptomgr crypto_null tcrypt dm-mod dm-crypt"
+
+ mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
diff --git a/0082-fips-fixed-module-list.patch b/0082-fips-fixed-module-list.patch
new file mode 100644
index 0000000..7025fa7
--- /dev/null
+++ b/0082-fips-fixed-module-list.patch
@@ -0,0 +1,22 @@
+From 8b01e6ff160fccee721b0c88332e64fb32505c78 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 5 Jul 2012 10:42:22 +0200
+Subject: [PATCH] fips: fixed module list
+
+---
+ modules.d/01fips/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 8d1dace..6a7aa08 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -13,7 +13,7 @@ depends() {
+ installkernel() {
+ local _fipsmodules _mod
+ _fipsmodules="aead aes_generic xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
+- _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256_generic sha512"
++ _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256 sha256_generic sha512 sha512_generic"
+ _fipsmodules+=" cryptomgr crypto_null tcrypt dm-mod dm-crypt"
+
+ mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
diff --git a/0083-Fix-fips-module-list.patch b/0083-Fix-fips-module-list.patch
new file mode 100644
index 0000000..c4b334a
--- /dev/null
+++ b/0083-Fix-fips-module-list.patch
@@ -0,0 +1,42 @@
+From b38911a399b155f04ebf3d6e9c2e602095f1706b Mon Sep 17 00:00:00 2001
+From: Milan Broz <mbroz at redhat.com>
+Date: Mon, 16 Jul 2012 16:28:47 +0200
+Subject: [PATCH] Fix fips module list.
+
+If dracut is build only with fips/fips-aesni (no crypto module),
+FIPS mode fails because of missing GCM modules.
+
+Just add proper modules to list (kernel have both maker as FIPS compliant already).
+
+Signed-off-by: Milan Broz <mbroz at redhat.com>
+---
+ modules.d/01fips/module-setup.sh | 2 +-
+ modules.d/02fips-aesni/module-setup.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 6a7aa08..3197611 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -12,7 +12,7 @@ depends() {
+
+ installkernel() {
+ local _fipsmodules _mod
+- _fipsmodules="aead aes_generic xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr"
++ _fipsmodules="aead aes_generic xts aes-x86_64 ansi_cprng cbc ccm chainiv ctr gcm ghash_generic"
+ _fipsmodules+=" des deflate ecb eseqiv hmac seqiv sha256 sha256_generic sha512 sha512_generic"
+ _fipsmodules+=" cryptomgr crypto_null tcrypt dm-mod dm-crypt"
+
+diff --git a/modules.d/02fips-aesni/module-setup.sh b/modules.d/02fips-aesni/module-setup.sh
+index f8fb705..fb4010d 100755
+--- a/modules.d/02fips-aesni/module-setup.sh
++++ b/modules.d/02fips-aesni/module-setup.sh
+@@ -12,7 +12,7 @@ depends() {
+
+ installkernel() {
+ local _fipsmodules _mod
+- _fipsmodules="aesni-intel"
++ _fipsmodules="aesni-intel ghash_clmulni_intel"
+
+ mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
+
diff --git a/0084-98usrmount-depend-on-fs-lib.patch b/0084-98usrmount-depend-on-fs-lib.patch
new file mode 100644
index 0000000..f62ffa4
--- /dev/null
+++ b/0084-98usrmount-depend-on-fs-lib.patch
@@ -0,0 +1,22 @@
+From 0201127ee9f9a7d15f9f0051abaf21ae51939b98 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe at aidecoe.name>
+Date: Mon, 25 Jun 2012 18:32:00 +0200
+Subject: [PATCH] 98usrmount: depend on fs-lib
+
+---
+ modules.d/98usrmount/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/98usrmount/module-setup.sh b/modules.d/98usrmount/module-setup.sh
+index 5844383..69d22d8 100755
+--- a/modules.d/98usrmount/module-setup.sh
++++ b/modules.d/98usrmount/module-setup.sh
+@@ -8,7 +8,7 @@ check() {
+ }
+
+ depends() {
+- return 0
++ echo 'fs-lib'
+ }
+
+ install() {
diff --git a/0085-man-pages-hostonly-mode-generates-host-specific-conf.patch b/0085-man-pages-hostonly-mode-generates-host-specific-conf.patch
new file mode 100644
index 0000000..3b5ee48
--- /dev/null
+++ b/0085-man-pages-hostonly-mode-generates-host-specific-conf.patch
@@ -0,0 +1,41 @@
+From 38f39bc5de8d9d328b4c805f303ae863094527b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe at aidecoe.name>
+Date: Mon, 25 Jun 2012 18:32:01 +0200
+Subject: [PATCH] man pages: hostonly mode generates host-specific
+ configuration
+
+This fact hasn't been mentioned.
+---
+ dracut.8.asc | 4 ++--
+ dracut.conf.5.asc | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/dracut.8.asc b/dracut.8.asc
+index cadd740..bab5996 100644
+--- a/dracut.8.asc
++++ b/dracut.8.asc
+@@ -232,8 +232,8 @@ Default:
+ This is useful when running dracut from a git checkout.
+
+ **-H, --hostonly**::
+- Host-Only mode: Install only what is needed for booting
+- the local host instead of a generic host.
++ Host-Only mode: Install only what is needed for booting the local host
++ instead of a generic host and generate host-specific configuration.
+ +
+ [WARNING]
+ ====
+diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
+index 017a221..d17477d 100644
+--- a/dracut.conf.5.asc
++++ b/dracut.conf.5.asc
+@@ -65,7 +65,8 @@ line are not interpreted.
+ Strip binaries in the initramfs (default=yes)
+
+ *hostonly=*"__{yes|no}__"::
+- Host-Only mode: Install only what is needed for booting the local host instead of a generic host.
++ Host-Only mode: Install only what is needed for booting the local host
++ instead of a generic host and generate host-specific configuration.
+
+ *tmpdir=*"__<temporary directory>__"::
+ Specify temporary directory to use.
diff --git a/0086-Fixed-BOOTIF-for-converting-mac-addr-to-lowercase.patch b/0086-Fixed-BOOTIF-for-converting-mac-addr-to-lowercase.patch
new file mode 100644
index 0000000..6bce006
--- /dev/null
+++ b/0086-Fixed-BOOTIF-for-converting-mac-addr-to-lowercase.patch
@@ -0,0 +1,38 @@
+From ce04d3ba9a3738ace57375b45fcba8810f95ba57 Mon Sep 17 00:00:00 2001
+From: Srinivasa T N <seenutn at linux.vnet.ibm.com>
+Date: Wed, 27 Jun 2012 11:29:13 +0530
+Subject: [PATCH] Fixed BOOTIF for converting mac addr to lowercase
+
+The patch, acfab373 - Handle upper case MAC addresses in ifname
+option,takes care of only the MAC conversion to lower case in the
+interface name. But the same has to be taken care for BOOTIF also.
+This patch takes care of changing the BOOTIF to lower case.
+
+Note that sed has been used in the patch instead of tr, as it is not
+compulsion to install tr by dracut in the initramfs and may not be
+available always.
+
+Signed-off-by: Srinivasa T N (seenutn at linux.vnet.ibm.com)
+
+>From 2ec9c91adbf808dbad9bdd2057d9df55a62b711f Mon Sep 17 00:00:00 2001
+From: Srinivasa T N <seenutn at linux.vnet.ibm.com>
+Date: Wed, 27 Jun 2012 11:20:13 +0530
+Subject: [PATCH] Fixed BOOTIF for converting mac addr to lowercase
+---
+ modules.d/40network/net-genrules.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
+index b79f731..1f022d0 100755
+--- a/modules.d/40network/net-genrules.sh
++++ b/modules.d/40network/net-genrules.sh
+@@ -10,7 +10,8 @@ fix_bootif() {
+ macaddr=${macaddr%:}
+ # strip hardware type field from pxelinux
+ [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
+- echo $macaddr
++ # return macaddr with lowercase alpha characters expected by udev
++ echo $macaddr | sed 'y/ABCDEF/abcdef/'
+ }
+
+ # Don't continue if we don't need network
diff --git a/0087-modules.d-get-rid-of-tr.patch b/0087-modules.d-get-rid-of-tr.patch
new file mode 100644
index 0000000..b355316
--- /dev/null
+++ b/0087-modules.d-get-rid-of-tr.patch
@@ -0,0 +1,178 @@
+From bccec3d1abf0dd700655d35e6c79d1ca4f76c7b6 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 27 Jun 2012 14:16:32 +0200
+Subject: [PATCH] modules.d: get rid of "tr"
+
+replace it with sed or str_replace or bash ${var/a/b}
+---
+ modules.d/10i18n/module-setup.sh | 2 +-
+ modules.d/40network/module-setup.sh | 2 +-
+ modules.d/40network/net-lib.sh | 2 +-
+ modules.d/40network/parse-bond.sh | 6 +++---
+ modules.d/40network/parse-bridge.sh | 2 +-
+ modules.d/40network/parse-ifname.sh | 2 +-
+ modules.d/80cms/cms-write-ifcfg.sh | 2 +-
+ modules.d/80cms/module-setup.sh | 2 +-
+ modules.d/95dasd/module-setup.sh | 2 +-
+ modules.d/95zfcp/module-setup.sh | 3 +--
+ modules.d/95zfcp/zfcpconf.sh | 2 +-
+ 11 files changed, 13 insertions(+), 14 deletions(-)
+
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index 5aa54d5..6d44a69 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
+@@ -31,7 +31,7 @@ install() {
+ *) cmd=grep ;;
+ esac
+
+- for INCL in $($cmd "^include " $MAP | cut -d' ' -f2 | tr -d '"'); do
++ for INCL in $($cmd "^include " $MAP | while read a a b; do echo ${a/\"/}; done); do
+ for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
+ findkeymap $FN
+ done
+diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
+index c764bef..dbbc807 100755
+--- a/modules.d/40network/module-setup.sh
++++ b/modules.d/40network/module-setup.sh
+@@ -77,7 +77,7 @@ installkernel() {
+
+ install() {
+ local _arch _i _dir
+- dracut_install ip arping tr dhclient
++ dracut_install ip arping dhclient
+ dracut_install -o brctl ifenslave
+ inst "$moddir/ifup.sh" "/sbin/ifup"
+ inst "$moddir/netroot.sh" "/sbin/netroot"
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index 1acd549..e3f08f2 100644
+--- a/modules.d/40network/net-lib.sh
++++ b/modules.d/40network/net-lib.sh
+@@ -13,7 +13,7 @@ iface_for_remote_addr() {
+ }
+
+ iface_for_mac() {
+- local interface="" mac="$(echo $1 | tr '[:upper:]' '[:lower:]')"
++ local interface="" mac="$(echo $1 | sed 'y/ABCDEF/abcdef/')"
+ for interface in /sys/class/net/*; do
+ if [ $(cat $interface/address) = "$mac" ]; then
+ echo ${interface##*/}
+diff --git a/modules.d/40network/parse-bond.sh b/modules.d/40network/parse-bond.sh
+index 933ad27..983eb3a 100755
+--- a/modules.d/40network/parse-bond.sh
++++ b/modules.d/40network/parse-bond.sh
+@@ -32,8 +32,8 @@ parsebond() {
+ case $# in
+ 0) bondname=bond0; bondslaves="eth0 eth1" ;;
+ 1) bondname=$1; bondslaves="eth0 eth1" ;;
+- 2) bondname=$1; bondslaves=$(echo $2|tr "," " ") ;;
+- 3) bondname=$1; bondslaves=$(echo $2|tr "," " "); bondoptions=$(echo $3|tr "," " ") ;;
++ 2) bondname=$1; bondslaves=$(str_replace "$2" "," " ") ;;
++ 3) bondname=$1; bondslaves=$(str_replace "$2" "," " "); bondoptions=$(str_replace "$3" "," " ") ;;
+ *) die "bond= requires zero to four parameters" ;;
+ esac
+ }
+@@ -53,7 +53,7 @@ if getarg bond >/dev/null; then
+ bondslaves="eth0 eth1"
+ fi
+ # Make it suitable for initscripts export
+- bondoptions=$(echo $bondoptions|tr ";" ",")
++ bondoptions=$(str_replace "$bondoptions" ";" ",")
+ echo "bondname=$bondname" > /tmp/bond.info
+ echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.info
+ echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.info
+diff --git a/modules.d/40network/parse-bridge.sh b/modules.d/40network/parse-bridge.sh
+index 5728fb6..1f027bb 100755
+--- a/modules.d/40network/parse-bridge.sh
++++ b/modules.d/40network/parse-bridge.sh
+@@ -29,7 +29,7 @@ parsebridge() {
+ case $# in
+ 0) bridgename=br0; ethnames=$iface ;;
+ 1) die "bridge= requires two parameters" ;;
+- 2) bridgename=$1; ethnames=$(echo $2|tr "," " ") ;;
++ 2) bridgename=$1; ethnames=$(str_replace "$2" "," " ") ;;
+ *) die "bridge= requires two parameters" ;;
+ esac
+ }
+diff --git a/modules.d/40network/parse-ifname.sh b/modules.d/40network/parse-ifname.sh
+index 26e6084..ce73a72 100755
+--- a/modules.d/40network/parse-ifname.sh
++++ b/modules.d/40network/parse-ifname.sh
+@@ -26,7 +26,7 @@ parse_ifname_opts() {
+ 7)
+ ifname_if=$1
+ # udev requires MAC addresses to be lower case
+- ifname_mac=`echo $2:$3:$4:$5:$6:$7 | tr '[:upper:]' '[:lower:]'`
++ ifname_mac=$(echo $2:$3:$4:$5:$6:$7 | sed 'y/ABCDEF/abcdef/')
+ ;;
+ *)
+ die "Invalid arguments for ifname="
+diff --git a/modules.d/80cms/cms-write-ifcfg.sh b/modules.d/80cms/cms-write-ifcfg.sh
+index 6349df3..6df6354 100755
+--- a/modules.d/80cms/cms-write-ifcfg.sh
++++ b/modules.d/80cms/cms-write-ifcfg.sh
+@@ -89,7 +89,7 @@ EOF
+ for option in LAYER2 PORTNO; do
+ [ -z "${!option}" ] && continue
+ [ -n "$optstr" ] && optstr=${optstr}" "
+- optstr=${optstr}$(echo ${option} | tr [[:upper:]] [[:lower:]])"="${!option}
++ optstr=${optstr}$(echo ${option} | sed 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/')"="${!option}
+ done
+ # write single quotes since network.py removes double quotes but we need quotes
+ echo "OPTIONS='$optstr'" >> $IFCFGFILE
+diff --git a/modules.d/80cms/module-setup.sh b/modules.d/80cms/module-setup.sh
+index 15dce89..22f4837 100755
+--- a/modules.d/80cms/module-setup.sh
++++ b/modules.d/80cms/module-setup.sh
+@@ -34,5 +34,5 @@ install() {
+ inst_libdir_file "gconv/*"
+ #inst /usr/lib/locale/locale-archive
+
+- dracut_install cmsfs-fuse fusermount ulockmgr_server bash tr insmod rmmod cat normalize_dasd_arg
++ dracut_install cmsfs-fuse fusermount ulockmgr_server bash insmod rmmod cat normalize_dasd_arg
+ }
+diff --git a/modules.d/95dasd/module-setup.sh b/modules.d/95dasd/module-setup.sh
+index 74efc7b..62bf18c 100755
+--- a/modules.d/95dasd/module-setup.sh
++++ b/modules.d/95dasd/module-setup.sh
+@@ -18,7 +18,7 @@ installkernel() {
+
+ install() {
+ inst_hook cmdline 30 "$moddir/parse-dasd.sh"
+- dracut_install tr dasdinfo dasdconf.sh normalize_dasd_arg
++ dracut_install dasdinfo dasdconf.sh normalize_dasd_arg
+ if [[ $hostonly ]]; then
+ inst /etc/dasd.conf
+ fi
+diff --git a/modules.d/95zfcp/module-setup.sh b/modules.d/95zfcp/module-setup.sh
+index cb0b719..22080dd 100755
+--- a/modules.d/95zfcp/module-setup.sh
++++ b/modules.d/95zfcp/module-setup.sh
+@@ -22,7 +22,6 @@ installkernel() {
+
+ install() {
+ inst_hook cmdline 30 "$moddir/parse-zfcp.sh"
+- dracut_install tr
+
+ inst /sbin/zfcpconf.sh
+ inst_rules 56-zfcp.rules
+@@ -31,4 +30,4 @@ install() {
+ inst /etc/zfcp.conf
+ fi
+ dracut_install zfcp_cio_free grep sed seq
+-}
+\ No newline at end of file
++}
+diff --git a/modules.d/95zfcp/zfcpconf.sh b/modules.d/95zfcp/zfcpconf.sh
+index ceced35..7127eae 100755
+--- a/modules.d/95zfcp/zfcpconf.sh
++++ b/modules.d/95zfcp/zfcpconf.sh
+@@ -30,7 +30,7 @@ if [ -f "$CONFIG" ]; then
+ if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
+ return
+ fi
+- tr "A-Z" "a-z" < $CONFIG| while read line; do
++ sed 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' < $CONFIG| while read line; do
+ case $line in
+ \#*) ;;
+ *)
diff --git a/0088-dracut-functions.sh-set-LC_ALL-C-to-get-correct-pars.patch b/0088-dracut-functions.sh-set-LC_ALL-C-to-get-correct-pars.patch
new file mode 100644
index 0000000..34c5835
--- /dev/null
+++ b/0088-dracut-functions.sh-set-LC_ALL-C-to-get-correct-pars.patch
@@ -0,0 +1,23 @@
+From 1b26ac6a5f07be4304c6bf47ef3e61da2651891b Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Sat, 30 Jun 2012 11:27:36 +0200
+Subject: [PATCH] dracut-functions.sh: set LC_ALL=C to get correct parsing
+ information
+
+---
+ dracut-functions.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 7b1c8dc..fc60f32 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -20,6 +20,8 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+
++export LC_ALL=C
++
+ if ! [[ $dracutbasedir ]]; then
+ dracutbasedir=${BASH_SOURCE[0]%/*}
+ [[ $dracutbasedir = "dracut-functions" ]] && dracutbasedir="."
diff --git a/0089-resume-move-resume-process-to-initqueue.patch b/0089-resume-move-resume-process-to-initqueue.patch
new file mode 100644
index 0000000..2e2e061
--- /dev/null
+++ b/0089-resume-move-resume-process-to-initqueue.patch
@@ -0,0 +1,63 @@
+From 9bb73893485da6543eee7e27bdab62386dcaa928 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 9 Jul 2012 17:06:51 +0200
+Subject: [PATCH] resume: move resume process to initqueue
+
+---
+ modules.d/95resume/parse-resume.sh | 2 ++
+ modules.d/95resume/resume-genrules.sh | 14 +++++++-------
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh
+index 32680c3..b460a16 100755
+--- a/modules.d/95resume/parse-resume.sh
++++ b/modules.d/95resume/parse-resume.sh
+@@ -15,6 +15,8 @@ case "$resume" in
+ resume="/dev/disk/by-label/${resume#LABEL=}" ;;
+ UUID=*) \
+ resume="/dev/disk/by-uuid/${resume#UUID=}" ;;
++ PARTUUID=*) \
++ resume="/dev/disk/by-partuuid/${resume#PARTUUID=}" ;;
+ esac
+
+ if splash=$(getarg splash=); then
+diff --git a/modules.d/95resume/resume-genrules.sh b/modules.d/95resume/resume-genrules.sh
+index ee4eacb..34511d7 100755
+--- a/modules.d/95resume/resume-genrules.sh
++++ b/modules.d/95resume/resume-genrules.sh
+@@ -21,18 +21,18 @@ if [ -n "$resume" ]; then
+
+ {
+ if [ -x /usr/sbin/resume ]; then
+- printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/usr/sbin/resume %s '%s'\"\n" \
++ printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /usr/sbin/resume %s '%s'\"\n" \
+ ${resume#/dev/} "$a_splash" "$resume";
+- printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/usr/sbin/resume %s '%s'\"\n" \
++ printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /usr/sbin/resume %s '%s'\"\n" \
+ ${resume#/dev/} "$a_splash" "$resume";
+ fi
+- printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
++ printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
+ ${resume#/dev/};
+- printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
++ printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
+ ${resume#/dev/};
+ } >> /etc/udev/rules.d/99-resume.rules
+
+- printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm "$job"; }\n' \
++ printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm "$job"; udevadm settle; }\n' \
+ "$resume" "$resume" >> $hookdir/initqueue/settled/resume.sh
+
+ printf 'warn "Cancelling resume operation. Device not found."; cancel_wait_for_dev /dev/resume; rm "$job" "%s/initqueue/settled/resume.sh";' \
+@@ -43,9 +43,9 @@ if [ -n "$resume" ]; then
+ elif ! getarg noresume; then
+ {
+ if [ -x /usr/sbin/resume ]; then
+- printf "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/usr/sbin/resume %s '\$tempnode'\"\n" "$a_splash"
++ printf "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /usr/sbin/resume %s '\$tempnode'\"\n" "$a_splash"
+ fi
+ echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," \
+- " RUN+=\"/bin/sh -c 'echo %M:%m > /sys/power/resume'\"";
++ " RUN+=\"/sbin/initqueue /bin/sh -c 'echo %M:%m > /sys/power/resume'\"";
+ } >> /etc/udev/rules.d/99-resume.rules
+ fi
diff --git a/0090-kernel-modules-module-setup.sh-also-install-lib-modp.patch b/0090-kernel-modules-module-setup.sh-also-install-lib-modp.patch
new file mode 100644
index 0000000..417ed96
--- /dev/null
+++ b/0090-kernel-modules-module-setup.sh-also-install-lib-modp.patch
@@ -0,0 +1,25 @@
+From 6a005b2603f410b394a34fc1e8a8f5d8d1060dd0 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 11 Jul 2012 08:42:21 +0200
+Subject: [PATCH] kernel-modules/module-setup.sh: also install
+ /lib/modprobe.d/*.conf
+
+In theory we should only install /lib/modprobe.d/*.conf and only for
+host-only the /etc/modprobe.d.
+---
+ modules.d/90kernel-modules/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 501088e..2999388 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -83,7 +83,7 @@ installkernel() {
+ install() {
+ local _f i
+ [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
+- for i in $(find -L /etc/modprobe.d/ -maxdepth 1 -type f -name '*.conf'); do
++ for i in $(find -L /{etc,lib}/modprobe.d/ -maxdepth 1 -type f -name '*.conf'); do
+ inst_simple "$i"
+ done
+ inst_hook cmdline 01 "$moddir/parse-kernel.sh"
diff --git a/0091-nfs-install-modprobe-config-file.patch b/0091-nfs-install-modprobe-config-file.patch
new file mode 100644
index 0000000..8bb0342
--- /dev/null
+++ b/0091-nfs-install-modprobe-config-file.patch
@@ -0,0 +1,60 @@
+From 61d9d1066ae0be0900c404175ec5164f96516e14 Mon Sep 17 00:00:00 2001
+From: Dave Young <dyoung at redhat.com>
+Date: Wed, 11 Jul 2012 13:08:18 +0800
+Subject: [PATCH] nfs: install modprobe config file
+
+install nfs modprobe config file
+
+For nfs4, in case nfs.ko is not loaded mount.nfs4 will try to load
+nfs4.ko instead of nfs.ko. Fedora nfs-utils creates a lib/modprobe.d/nfs.conf
+in which there's below alias:
+alias nfs4 nfs
+
+Dracut also need this file to auto load nfs kernel module.
+
+Tested booting to a fedora 17 nfsroot share.
+
+Signed-off-by: Dave Young <dyoung at redhat.com>
+
+Conflicts:
+ modules.d/95nfs/module-setup.sh
+---
+ modules.d/95nfs/module-setup.sh | 6 ++++++
+ modules.d/95nfs/parse-nfsroot.sh | 7 -------
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
+index 3587bdd..7f5406e 100755
+--- a/modules.d/95nfs/module-setup.sh
++++ b/modules.d/95nfs/module-setup.sh
+@@ -49,6 +49,12 @@ install() {
+ [ -e "$_i" ] && dracut_install "$_i"
+ done
+
++ if [ -f /lib/modprobe.d/nfs.conf ]; then
++ dracut_install /lib/modprobe.d/nfs.conf
++ else
++ echo "alias nfs4 nfs" > $initdir/etc/modprobe.d/nfs.conf
++ fi
++
+ _nsslibs=$(sed -e '/^#/d' -e 's/^.*://' -e 's/\[NOTFOUND=return\]//' /etc/nsswitch.conf \
+ | tr -s '[:space:]' '\n' | sort -u | tr -s '[:space:]' '|')
+ _nsslibs=${_nsslibs#|}
+diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh
+index 4e69edc..769d233 100755
+--- a/modules.d/95nfs/parse-nfsroot.sh
++++ b/modules.d/95nfs/parse-nfsroot.sh
+@@ -88,13 +88,6 @@ nfsroot_to_var $netroot
+ # Set fstype, might help somewhere
+ fstype=${nfs#/dev/}
+
+-# NFS actually supported? Some more uglyness here: nfs3 or nfs4 might not
+-# be in the module...
+-if ! incol2 /proc/filesystems $fstype ; then
+- modprobe nfs
+- incol2 /proc/filesystems $fstype || die "nfsroot type $fstype requested but kernel/initrd does not support nfs"
+-fi
+-
+ # Rewrite root so we don't have to parse this uglyness later on again
+ netroot="$fstype:$server:$path:$options"
+
diff --git a/0092-udev-rules-module-setup.sh-cope-with-systemd-udevd.patch b/0092-udev-rules-module-setup.sh-cope-with-systemd-udevd.patch
new file mode 100644
index 0000000..9e10047
--- /dev/null
+++ b/0092-udev-rules-module-setup.sh-cope-with-systemd-udevd.patch
@@ -0,0 +1,21 @@
+From 8645929032d7dd5d8cc31c99458df9d1a1f707af Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 18 Jul 2012 13:19:52 +0200
+Subject: [PATCH] udev-rules/module-setup.sh: cope with systemd-udevd
+
+---
+ modules.d/95udev-rules/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
+index b17232f..ca9a3ec 100755
+--- a/modules.d/95udev-rules/module-setup.sh
++++ b/modules.d/95udev-rules/module-setup.sh
+@@ -9,6 +9,7 @@ install() {
+ # of the rules we want so that we just copy those in would be best
+ dracut_install udevadm
+ [ -x /sbin/udevd ] && dracut_install udevd
++ [ -x /lib/systemd/systemd-udevd ] && inst /lib/systemd/systemd-udevd /sbin/udevd
+
+ for i in /etc/udev/udev.conf /etc/group; do
+ inst_simple $i
diff --git a/dracut.spec b/dracut.spec
index 89c4e57..ff36f7c 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
Name: dracut
Version: 018
-Release: 78.git20120622%{?dist}
+Release: 93.git20120719%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -101,6 +101,21 @@ Patch74: 0074-dracut.sh-mkdir-initdir-lib-dracut.patch
Patch75: 0075-multipath-module-setup.sh-installkernel-fix-return-c.patch
Patch76: 0076-dracut.sh-do-not-copy-devices-nodes-mknod-them.patch
Patch77: 0077-i18n-module-setup.sh-do-not-install-systemd-vconsole.patch
+Patch78: 0078-network-ifname-genrules.sh-no-rule-to-rename-other-i.patch
+Patch79: 0079-mdraid-md-shutdown.sh-wait-until-md-devices-are-clea.patch
+Patch80: 0080-fips-module-setup.sh-s-aes-xts-xts.patch
+Patch81: 0081-fips-change-module-list.patch
+Patch82: 0082-fips-fixed-module-list.patch
+Patch83: 0083-Fix-fips-module-list.patch
+Patch84: 0084-98usrmount-depend-on-fs-lib.patch
+Patch85: 0085-man-pages-hostonly-mode-generates-host-specific-conf.patch
+Patch86: 0086-Fixed-BOOTIF-for-converting-mac-addr-to-lowercase.patch
+Patch87: 0087-modules.d-get-rid-of-tr.patch
+Patch88: 0088-dracut-functions.sh-set-LC_ALL-C-to-get-correct-pars.patch
+Patch89: 0089-resume-move-resume-process-to-initqueue.patch
+Patch90: 0090-kernel-modules-module-setup.sh-also-install-lib-modp.patch
+Patch91: 0091-nfs-install-modprobe-config-file.patch
+Patch92: 0092-udev-rules-module-setup.sh-cope-with-systemd-udevd.patch
BuildArch: noarch
@@ -416,6 +431,14 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Thu Jul 19 2012 Harald Hoyer <harald at redhat.com> 018-93.git20120719
+- do not rename network interfaces
+- wait until md raids are clean on shutdown
+- fips module fixes
+- fixed BOOTIF case sensitive
+- fixed resume from hibernate
+- nfs module fixes
+
* Fri Jun 22 2012 Harald Hoyer <harald at redhat.com> 018-78.git20120622
- speedup install
- fixed installkernel() return codes
More information about the scm-commits
mailing list