[dracut/f17] dracut-018-31.git20120504
Harald Hoyer
harald at fedoraproject.org
Fri May 4 11:04:57 UTC 2012
commit adb47195451eb78277dd44ac9b90c76eb4964998
Author: Harald Hoyer <harald at redhat.com>
Date: Fri May 4 13:01:40 2012 +0200
dracut-018-31.git20120504
- fix anaconda installer bug
Resolves: rhbz#818707
...-add-str_ends-to-go-along-with-str_starts.patch | 2 +-
...tup_net-at-start-of-initqueue-online-hook.patch | 2 +-
...-save_netinfo-fix-problems-with-nfs-NM-ta.patch | 2 +-
...ep-work-as-documented-with-less-vars-than.patch | 2 +-
...tdown-use-emergency_shell-from-dracut-lib.patch | 2 +-
...k-avoid-remount-when-options-don-t-change.patch | 2 +-
0007-Debian-multiarch-support.patch | 2 +-
...og-installed-modules-to-initdir-lib-dracu.patch | 2 +-
0009-lvm-disable-lvmetad.patch | 2 +-
0010-udev-rules-remove-01-ignore.rules.patch | 2 +-
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 | 2 +-
...cleanup-scripts-to-pre-pivot-cleanup-hook.patch | 2 +-
...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 | 43 +++++++++++++++
...odule-setup.sh-fix-host-only-mount-checks.patch | 39 ++++++++++++++
...line-arg-duplicating-bug-with-etc-cmdline.patch | 29 ++++++++++
0029-ifcfg-fix-resolv.conf.patch | 23 ++++++++
...FSRAID-add-one-more-partition-to-the-btrf.patch | 55 ++++++++++++++++++++
30 files changed, 214 insertions(+), 25 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..57d3038 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
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut-lib: add str_ends, to go along with str_starts
---
modules.d/99base/dracut-lib.sh | 5 +++++
- 1 file changed, 5 insertions(+)
+ 1 Datei geändert, 5 Zeilen hinzugefügt(+)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index cb2e4dc..1ecd286 100755
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..0676381 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
@@ -11,7 +11,7 @@ error messages.
---
modules.d/40network/net-genrules.sh | 3 +++
modules.d/40network/net-lib.sh | 3 +++
- 2 files changed, 6 insertions(+)
+ 2 Dateien geändert, 6 Zeilen hinzugefügt(+)
diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index 84fd3ac..b3d5584 100755
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..20d9ddf 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
@@ -13,7 +13,7 @@ copies the dhclient files into place.
---
modules.d/40network/net-lib.sh | 16 ++++++++++++++++
modules.d/40network/netroot.sh | 10 ++--------
- 2 files changed, 18 insertions(+), 8 deletions(-)
+ 2 Dateien geändert, 18 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-)
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index a7abe81..c0f73da 100644
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..21a1481 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
@@ -11,7 +11,7 @@ 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 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 1ecd286..e10a34d 100755
diff --git a/0005-shutdown-use-emergency_shell-from-dracut-lib.patch b/0005-shutdown-use-emergency_shell-from-dracut-lib.patch
index adffe75..f486831 100644
--- a/0005-shutdown-use-emergency_shell-from-dracut-lib.patch
+++ b/0005-shutdown-use-emergency_shell-from-dracut-lib.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] shutdown: use emergency_shell from dracut-lib
---
modules.d/99base/dracut-lib.sh | 10 ++++----
modules.d/99shutdown/shutdown.sh | 47 +++-----------------------------------
- 2 files changed, 9 insertions(+), 48 deletions(-)
+ 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 48 Zeilen entfernt(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index e10a34d..a29d586 100755
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..05a6ec8 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
@@ -15,7 +15,7 @@ Detect and optimize for this case so that the filesystem is only
mounted once.
---
modules.d/95rootfs-block/mount-root.sh | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
+ 1 Datei geändert, 8 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
index 2c89431..aef99ae 100755
diff --git a/0007-Debian-multiarch-support.patch b/0007-Debian-multiarch-support.patch
index bcc733d..678c7ea 100644
--- a/0007-Debian-multiarch-support.patch
+++ b/0007-Debian-multiarch-support.patch
@@ -23,7 +23,7 @@ directory:
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(-)
+ 12 Dateien geändert, 58 Zeilen hinzugefügt(+), 42 Zeilen entfernt(-)
diff --git a/dracut-functions.sh b/dracut-functions.sh
index 910f2d8..f5611dc 100755
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..0487137 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
@@ -6,7 +6,7 @@ Subject: [PATCH] dracut.sh: log installed modules to
---
dracut.sh | 5 +++++
- 1 file changed, 5 insertions(+)
+ 1 Datei geändert, 5 Zeilen hinzugefügt(+)
diff --git a/dracut.sh b/dracut.sh
index 7f61143..1048e75 100755
diff --git a/0009-lvm-disable-lvmetad.patch b/0009-lvm-disable-lvmetad.patch
index 492b151..b122dbc 100644
--- a/0009-lvm-disable-lvmetad.patch
+++ b/0009-lvm-disable-lvmetad.patch
@@ -20,7 +20,7 @@ Falling back to internal scanning.
---
modules.d/90lvm/lvm_scan.sh | 2 ++
modules.d/90lvm/module-setup.sh | 1 +
- 2 files changed, 3 insertions(+)
+ 2 Dateien geändert, 3 Zeilen hinzugefügt(+)
diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
index 104565f..17c29bc 100755
diff --git a/0010-udev-rules-remove-01-ignore.rules.patch b/0010-udev-rules-remove-01-ignore.rules.patch
index ee21461..5041871 100644
--- a/0010-udev-rules-remove-01-ignore.rules.patch
+++ b/0010-udev-rules-remove-01-ignore.rules.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] udev-rules: remove 01-ignore.rules
---
modules.d/95udev-rules/01-ignore.rules | 1 -
modules.d/95udev-rules/module-setup.sh | 3 ---
- 2 files changed, 4 deletions(-)
+ 2 Dateien geändert, 4 Zeilen entfernt(-)
delete mode 100644 modules.d/95udev-rules/01-ignore.rules
diff --git a/modules.d/95udev-rules/01-ignore.rules b/modules.d/95udev-rules/01-ignore.rules
diff --git a/0011-lsinitrd-support-symlinks.patch b/0011-lsinitrd-support-symlinks.patch
index 683558e..48b3c89 100644
--- a/0011-lsinitrd-support-symlinks.patch
+++ b/0011-lsinitrd-support-symlinks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] lsinitrd: support symlinks
---
lsinitrd.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
diff --git a/lsinitrd.sh b/lsinitrd.sh
index 1eaa37d..e6767dc 100755
diff --git a/0012-dracut.cmdline.7.asc-document-resume-option.patch b/0012-dracut.cmdline.7.asc-document-resume-option.patch
index b64e907..c597330 100644
--- a/0012-dracut.cmdline.7.asc-document-resume-option.patch
+++ b/0012-dracut.cmdline.7.asc-document-resume-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut.cmdline.7.asc: document "resume=" option
---
dracut.cmdline.7.asc | 11 +++++++++++
- 1 file changed, 11 insertions(+)
+ 1 Datei geändert, 11 Zeilen hinzugefügt(+)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index a1e06dd..c77fee5 100644
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..a219309 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
@@ -6,7 +6,7 @@ Subject: [PATCH] dracut.spec: do not include IMA and selinux modules with
---
dracut.spec | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
+ 1 Datei geändert, 13 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
diff --git a/dracut.spec b/dracut.spec
index 074cb10..b5218d9 100644
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..63e4da0 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
@@ -8,7 +8,7 @@ strip plymouth from an initrd. Make this script a noop
if that has happened.
---
modules.d/50plymouth/plymouth-pretrigger.sh | 44 ++++++++++++++-------------
- 1 file changed, 23 insertions(+), 21 deletions(-)
+ 1 Datei geändert, 23 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-)
diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
index 57955e7..50828af 100755
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..a1c9124 100644
--- a/0015-man-Fix-add-fstab-option-in-man-page.patch
+++ b/0015-man-Fix-add-fstab-option-in-man-page.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] man: Fix --add-fstab option in man page
---
dracut.8.asc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
diff --git a/dracut.8.asc b/dracut.8.asc
index 24b7a8c..cadd740 100644
diff --git a/0016-base-init.sh-mount-tmpfs-with-strictatime.patch b/0016-base-init.sh-mount-tmpfs-with-strictatime.patch
index bd22ed7..eaee3de 100644
--- a/0016-base-init.sh-mount-tmpfs-with-strictatime.patch
+++ b/0016-base-init.sh-mount-tmpfs-with-strictatime.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] base/init.sh: mount tmpfs with strictatime
---
modules.d/99base/init.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
index 2f87a20..b5adcad 100755
diff --git a/0017-99shutdown-shutdown.sh-export-PATH.patch b/0017-99shutdown-shutdown.sh-export-PATH.patch
index c162520..c6674bc 100644
--- a/0017-99shutdown-shutdown.sh-export-PATH.patch
+++ b/0017-99shutdown-shutdown.sh-export-PATH.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 99shutdown/shutdown.sh: export PATH
---
modules.d/99shutdown/shutdown.sh | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ 1 Datei geändert, 2 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
index 45345a4..aa0a81f 100755
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..d091b50 100644
--- a/0018-Makefile-do-not-install-systemd-service-in-reboot.patch
+++ b/0018-Makefile-do-not-install-systemd-service-in-reboot.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Makefile: do not install systemd service in reboot
shutdown is enough. It is pulled in on reboot.
---
Makefile | 3 ---
- 1 file changed, 3 deletions(-)
+ 1 Datei geändert, 3 Zeilen entfernt(-)
diff --git a/Makefile b/Makefile
index c62aae1..5ce1778 100644
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..b02867b 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
@@ -6,7 +6,7 @@ Subject: [PATCH] network/module-setup.sh: include all kernel/drivers/net/phy
---
modules.d/40network/module-setup.sh | 1 +
- 1 file changed, 1 insertion(+)
+ 1 Datei geändert, 1 Zeile hinzugefügt(+)
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index 97fc5cb..253a87e 100755
diff --git a/0020-add-pre-pivot-cleanup-hook.patch b/0020-add-pre-pivot-cleanup-hook.patch
index e686e23..cc100b9 100644
--- a/0020-add-pre-pivot-cleanup-hook.patch
+++ b/0020-add-pre-pivot-cleanup-hook.patch
@@ -17,7 +17,7 @@ Signed-off-by: Dave Young <dyoung at redhat.com>
dracut.asc | 7 ++++++-
dracut.cmdline.7.asc | 2 +-
modules.d/99base/init.sh | 7 ++++++-
- 5 files changed, 17 insertions(+), 4 deletions(-)
+ 5 Dateien geändert, 17 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/README.modules b/README.modules
index 21461de..188d011 100644
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..78aa820 100644
--- a/0021-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
+++ b/0021-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
@@ -17,7 +17,7 @@ Signed-off-by: Dave Young <dyoung at redhat.com>
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(-)
+ 5 Dateien geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index 253a87e..c2ad815 100755
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..382792e 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
@@ -7,7 +7,7 @@ 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 --------
- 1 file changed, 8 deletions(-)
+ 1 Datei geändert, 8 Zeilen entfernt(-)
diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
index 97702a2..5637a9a 100755
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..4c63b39 100644
--- a/0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
+++ b/0023-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
@@ -11,7 +11,7 @@ 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 +++++
- 1 file changed, 5 insertions(+)
+ 1 Datei geändert, 5 Zeilen hinzugefügt(+)
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
index c072a13..b81ac39 100755
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..a081ea9 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
@@ -11,7 +11,7 @@ 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 +
- 1 file changed, 1 insertion(+)
+ 1 Datei geändert, 1 Zeile hinzugefügt(+)
diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
index e305a68..7930146 100755
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..fcdb9dc 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
@@ -12,7 +12,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 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ 1 Datei geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
index 7930146..5721294 100755
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
new file mode 100644
index 0000000..3f078c4
--- /dev/null
+++ b/0026-iscsi-module-setup.sh-fix-host-only-mount-checks.patch
@@ -0,0 +1,43 @@
+From 8c61158c363e22ac19f33286c26d42db774607fd Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+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 ++++++----------
+ 1 Datei geändert, 6 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-)
+
+diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
+index a001a28..25a3cfa 100755
+--- a/modules.d/95iscsi/module-setup.sh
++++ b/modules.d/95iscsi/module-setup.sh
+@@ -15,8 +15,11 @@ check() {
+ [[ $debug ]] && set -x
+
+ is_iscsi() (
+- [[ -L /sys/dev/block/$1 ]] || return
+- cd "$(readlink -f /sys/dev/block/$1)"
++ local _dev
++ _dev=$(get_maj_min $1)
++
++ [[ -L /sys/dev/block/$_dev ]] || return
++ cd "$(readlink -f /sys/dev/block/$_dev)"
+ until [[ -d sys || -d iscsi_session ]]; do
+ cd ..
+ done
+@@ -24,14 +27,7 @@ check() {
+ )
+
+ [[ $hostonly ]] || [[ $mount_needs ]] && {
+- _rootdev=$(find_root_block_device)
+- if [[ $_rootdev ]]; then
+- # root lives on a block device, so we can be more precise about
+- # hostonly checking
+- check_block_and_slaves is_iscsi "$_rootdev" || return 1
+- else
+- return 1
+- fi
++ for_each_host_dev_fs is_iscsi || return 1
+ }
+ return 0
+ }
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
new file mode 100644
index 0000000..af5c071
--- /dev/null
+++ b/0027-multipath-module-setup.sh-fix-host-only-mount-checks.patch
@@ -0,0 +1,39 @@
+From c18772705e0d25c8af56c04fa098ec01f56ee4aa Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+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 +++++++---------
+ 1 Datei geändert, 7 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-)
+
+diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
+index f044f33..2f6b416 100755
+--- a/modules.d/90multipath/module-setup.sh
++++ b/modules.d/90multipath/module-setup.sh
+@@ -11,18 +11,16 @@ check() {
+ [[ $debug ]] && set -x
+
+ is_mpath() {
+- [ -e /sys/dev/block/$1/dm/uuid ] || return 1
+- [[ $(cat /sys/dev/block/$1/dm/uuid) =~ ^mpath- ]] && return 0
++ local _dev
++ _dev=$(get_maj_min $1)
++ [ -e /sys/dev/block/$_dev/dm/uuid ] || return 1
++ [[ $(cat /sys/dev/block/$_dev/dm/uuid) =~ ^mpath- ]] && return 0
+ return 1
+ }
+
+- if [[ $hostonly ]]; then
+- _rootdev=$(find_root_block_device)
+- if [[ $_rootdev ]]; then
+- check_block_and_slaves is_mpath "$_rootdev" && return 0
+- fi
+- return 1
+- fi
++ [[ $hostonly ]] || [[ $mount_needs ]] && {
++ for_each_host_dev_fs is_mpath || return 1
++ }
+
+ return 0
+ }
diff --git a/0028-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch b/0028-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
new file mode 100644
index 0000000..946964d
--- /dev/null
+++ b/0028-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
@@ -0,0 +1,29 @@
+From c870ae09ec04b5da48c4d2b2802dd6eba468e8ed Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods at redhat.com>
+Date: Tue, 1 May 2012 14:08:33 -0400
+Subject: [PATCH] fix _getcmdline arg-duplicating bug with /etc/cmdline*
+
+If you unset CMDLINE to make _getcmdline re-read /etc/cmdline and
+/etc/cmdline.d/*, CMDLINE_ETC and CMDLINE_ETC_D would keep their
+contents.
+
+This is a serious problem if you have (e.g.) "ip=eth0:dhcp" in
+/etc/cmdline.d/net.conf, because getargs ip= will return
+"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 +
+ 1 Datei geändert, 1 Zeile hinzugefügt(+)
+
+diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
+index a29d586..4f2b8cd 100755
+--- a/modules.d/99base/dracut-lib.sh
++++ b/modules.d/99base/dracut-lib.sh
+@@ -40,6 +40,7 @@ _getcmdline() {
+ local _i
+ unset _line
+ if [ -z "$CMDLINE" ]; then
++ unset CMDLINE_ETC CMDLINE_ETC_D
+ if [ -e /etc/cmdline ]; then
+ while read -r _line; do
+ CMDLINE_ETC="$CMDLINE_ETC $_line";
diff --git a/0029-ifcfg-fix-resolv.conf.patch b/0029-ifcfg-fix-resolv.conf.patch
new file mode 100644
index 0000000..2d6c3ae
--- /dev/null
+++ b/0029-ifcfg-fix-resolv.conf.patch
@@ -0,0 +1,23 @@
+From 2336f7d9e7ff572d3335bb6c42fa2ac224edd64b Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods at redhat.com>
+Date: Tue, 1 May 2012 14:08:34 -0400
+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 +-
+ 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+
+diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
+index b81ac39..f612762 100755
+--- a/modules.d/45ifcfg/write-ifcfg.sh
++++ b/modules.d/45ifcfg/write-ifcfg.sh
+@@ -152,7 +152,7 @@ echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
+ echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
+ {
+ cp /tmp/net.* /run/initramfs/
+- cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/
++ cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf
+ cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/*
+ cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient
+ } > /dev/null 2>&1
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
new file mode 100644
index 0000000..6142dca
--- /dev/null
+++ b/0030-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch
@@ -0,0 +1,55 @@
+From 4fdeb5a7013e502a084dea1b0ac928259bb2e13e Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 25 Apr 2012 14:23:12 +0200
+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 +-
+ 2 Dateien geändert, 10 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
+
+diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh
+index 60dd319..3debf33 100755
+--- a/test/TEST-15-BTRFSRAID/create-root.sh
++++ b/test/TEST-15-BTRFSRAID/create-root.sh
+@@ -5,17 +5,23 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
+ done
+ udevadm control --reload-rules
+ # save a partition at the beginning for future flagging purposes
+-sfdisk -C 524288 -H 2 -S 32 -L /dev/sda <<EOF
++sfdisk -C 655600 -H 2 -S 32 -L /dev/sda <<EOF
+ ,16
++,,E
++;
++;
++,10240
+ ,10240
+ ,10240
+ ,10240
+ EOF
+-mkfs.btrfs -mraid10 -L root /dev/sda2 /dev/sda3 /dev/sda4
++mkfs.btrfs -draid10 -mraid10 -L root /dev/sda5 /dev/sda6 /dev/sda7 /dev/sda8
++udevadm settle
+ btrfs device scan
++udevadm settle
+ set -e
+ mkdir -p /sysroot
+-mount /dev/sda4 /sysroot
++mount -t btrfs /dev/sda8 /sysroot
+ cp -a -t /sysroot /source/*
+ umount /sysroot
+ echo "dracut-root-block-created" >/dev/sda1
+diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
+index f64b2b2..b65e77a 100755
+--- a/test/TEST-15-BTRFSRAID/test.sh
++++ b/test/TEST-15-BTRFSRAID/test.sh
+@@ -20,7 +20,7 @@ test_setup() {
+ # Create the blank file to use as a root filesystem
+ DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-root.img
+ rm -f $DISKIMAGE
+- dd if=/dev/null of=$DISKIMAGE bs=1M seek=1024
++ dd if=/dev/null of=$DISKIMAGE bs=2M seek=1024
+
+ kernel=$KVERSION
+ # Create what will eventually be our root filesystem onto an overlay
More information about the scm-commits
mailing list