From 35271e26a2c6a73be67693ebcc90ec9f95303f41 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: May 22 2012 09:49:50 +0000
Subject: dracut-018-74.git20120522


- new upstream version

---

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 57d3038..21fdb61 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 Datei geändert, 5 Zeilen hinzugefügt(+)
+ 1 file changed, 5 insertions(+)
 
 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 0676381..1f0edc6 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 Dateien geändert, 6 Zeilen hinzugefügt(+)
+ 2 files changed, 6 insertions(+)
 
 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 20d9ddf..5488f55 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 Dateien geändert, 18 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-)
+ 2 files changed, 18 insertions(+), 8 deletions(-)
 
 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 21a1481..b6188c0 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 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 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 f486831..adffe75 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 Dateien geändert, 9 Zeilen hinzugefügt(+), 48 Zeilen entfernt(-)
+ 2 files changed, 9 insertions(+), 48 deletions(-)
 
 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 05a6ec8..189a976 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 Datei geändert, 8 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
+ 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
 index 2c89431..aef99ae 100755
diff --git a/0007-Debian-multiarch-support.patch b/0007-Debian-multiarch-support.patch
index 678c7ea..bcc733d 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 Dateien geändert, 58 Zeilen hinzugefügt(+), 42 Zeilen entfernt(-)
+ 12 files changed, 58 insertions(+), 42 deletions(-)
 
 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 0487137..b7f7224 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 Datei geändert, 5 Zeilen hinzugefügt(+)
+ 1 file changed, 5 insertions(+)
 
 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 b122dbc..492b151 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 Dateien geändert, 3 Zeilen hinzugefügt(+)
+ 2 files changed, 3 insertions(+)
 
 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 5041871..ee21461 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 Dateien geändert, 4 Zeilen entfernt(-)
+ 2 files changed, 4 deletions(-)
  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 48b3c89..683558e 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 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 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 c597330..b64e907 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 Datei geändert, 11 Zeilen hinzugefügt(+)
+ 1 file changed, 11 insertions(+)
 
 diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
 index a1e06dd..c77fee5 100644
diff --git a/0013-virtfs-root-filesystem-support.patch b/0013-virtfs-root-filesystem-support.patch
index 9aff639..cf2c680 100644
--- a/0013-virtfs-root-filesystem-support.patch
+++ b/0013-virtfs-root-filesystem-support.patch
@@ -21,7 +21,7 @@ Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
  modules.d/95virtfs/module-setup.sh |   27 +++++++++++++
  modules.d/95virtfs/mount-virtfs.sh |   75 ++++++++++++++++++++++++++++++++++++
  modules.d/95virtfs/parse-virtfs.sh |    9 +++++
- 4 Dateien geändert, 112 Zeilen hinzugefügt(+)
+ 4 files changed, 112 insertions(+)
  create mode 100755 modules.d/95virtfs/module-setup.sh
  create mode 100755 modules.d/95virtfs/mount-virtfs.sh
  create mode 100755 modules.d/95virtfs/parse-virtfs.sh
diff --git a/0014-dracut.spec-do-not-include-IMA-and-selinux-modules-w.patch b/0014-dracut.spec-do-not-include-IMA-and-selinux-modules-w.patch
index d03ae71..d50981a 100644
--- a/0014-dracut.spec-do-not-include-IMA-and-selinux-modules-w.patch
+++ b/0014-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 Datei geändert, 13 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
+ 1 file changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/dracut.spec b/dracut.spec
 index 9cd08b7..9f64213 100644
diff --git a/0015-Do-not-run-plymouth-hook-if-the-binary-is-missing.patch b/0015-Do-not-run-plymouth-hook-if-the-binary-is-missing.patch
index ba60195..23cabe3 100644
--- a/0015-Do-not-run-plymouth-hook-if-the-binary-is-missing.patch
+++ b/0015-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 Datei geändert, 23 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-)
+ 1 file changed, 23 insertions(+), 21 deletions(-)
 
 diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
 index 57955e7..50828af 100755
diff --git a/0016-man-Fix-add-fstab-option-in-man-page.patch b/0016-man-Fix-add-fstab-option-in-man-page.patch
index afcae89..b26d1ea 100644
--- a/0016-man-Fix-add-fstab-option-in-man-page.patch
+++ b/0016-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 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dracut.8.asc b/dracut.8.asc
 index 24b7a8c..cadd740 100644
diff --git a/0017-udevd-moved-to-lib-systemd-systemd-udevd.patch b/0017-udevd-moved-to-lib-systemd-systemd-udevd.patch
index 2c57adb..7b7558d 100644
--- a/0017-udevd-moved-to-lib-systemd-systemd-udevd.patch
+++ b/0017-udevd-moved-to-lib-systemd-systemd-udevd.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] udevd moved to /lib/systemd/systemd-udevd
  dracut.conf.d/fedora.conf.example      |    1 +
  modules.d/95udev-rules/module-setup.sh |   10 +++++++++-
  modules.d/99base/init.sh               |    2 +-
- 3 Dateien geändert, 11 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
+ 3 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
 index 02a530e..617d967 100644
diff --git a/0018-base-init.sh-mount-tmpfs-with-strictatime.patch b/0018-base-init.sh-mount-tmpfs-with-strictatime.patch
index af83448..4f056f8 100644
--- a/0018-base-init.sh-mount-tmpfs-with-strictatime.patch
+++ b/0018-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 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
 index 0ea72e8..65bc88f 100755
diff --git a/0019-99shutdown-shutdown.sh-export-PATH.patch b/0019-99shutdown-shutdown.sh-export-PATH.patch
index 05d88a0..4992a2b 100644
--- a/0019-99shutdown-shutdown.sh-export-PATH.patch
+++ b/0019-99shutdown-shutdown.sh-export-PATH.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 99shutdown/shutdown.sh: export PATH
 
 ---
  modules.d/99shutdown/shutdown.sh |    5 ++---
- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
 index 45345a4..aa0a81f 100755
diff --git a/0020-Makefile-do-not-install-systemd-service-in-reboot.patch b/0020-Makefile-do-not-install-systemd-service-in-reboot.patch
index 8dd1143..e34ee4d 100644
--- a/0020-Makefile-do-not-install-systemd-service-in-reboot.patch
+++ b/0020-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 Datei geändert, 3 Zeilen entfernt(-)
+ 1 file changed, 3 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index c62aae1..5ce1778 100644
diff --git a/0021-network-module-setup.sh-include-all-kernel-drivers-n.patch b/0021-network-module-setup.sh-include-all-kernel-drivers-n.patch
index 9dd3cbb..563be43 100644
--- a/0021-network-module-setup.sh-include-all-kernel-drivers-n.patch
+++ b/0021-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 Datei geändert, 1 Zeile hinzugefügt(+)
+ 1 file changed, 1 insertion(+)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
 index 97fc5cb..253a87e 100755
diff --git a/0022-add-pre-pivot-cleanup-hook.patch b/0022-add-pre-pivot-cleanup-hook.patch
index 078a65b..b60a5de 100644
--- a/0022-add-pre-pivot-cleanup-hook.patch
+++ b/0022-add-pre-pivot-cleanup-hook.patch
@@ -17,7 +17,7 @@ Signed-off-by: Dave Young <dyoung@redhat.com>
  dracut.asc               |    7 ++++++-
  dracut.cmdline.7.asc     |    2 +-
  modules.d/99base/init.sh |    7 ++++++-
- 5 Dateien geändert, 17 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
+ 5 files changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/README.modules b/README.modules
 index 21461de..188d011 100644
diff --git a/0023-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch b/0023-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
index a300cc8..8618ece 100644
--- a/0023-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
+++ b/0023-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
@@ -17,7 +17,7 @@ Signed-off-by: Dave Young <dyoung@redhat.com>
  modules.d/90multipath/module-setup.sh |    2 +-
  modules.d/95iscsi/module-setup.sh     |    2 +-
  modules.d/95nfs/module-setup.sh       |    2 +-
- 5 Dateien geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
+ 5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
 index 253a87e..c2ad815 100755
diff --git a/0024-network-parse-ip-opts.sh-remove-check-for-netroot.patch b/0024-network-parse-ip-opts.sh-remove-check-for-netroot.patch
index 09680c8..9d39039 100644
--- a/0024-network-parse-ip-opts.sh-remove-check-for-netroot.patch
+++ b/0024-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 Datei geändert, 8 Zeilen entfernt(-)
+ 1 file changed, 8 deletions(-)
 
 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/0025-url-lib-don-t-add-existing-handlers-multiple-times.patch b/0025-url-lib-don-t-add-existing-handlers-multiple-times.patch
index a6113ba..89d342c 100644
--- a/0025-url-lib-don-t-add-existing-handlers-multiple-times.patch
+++ b/0025-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 Datei geändert, 1 Zeile hinzugefügt(+)
+ 1 file changed, 1 insertion(+)
 
 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/0026-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch b/0026-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch
index 4e18f7b..70b8b29 100644
--- a/0026-url-lib-don-t-use-progress-bar-if-TERM-dumb-RHBZ-814.patch
+++ b/0026-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 Datei geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
+ 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
 index 7930146..5721294 100755
diff --git a/0027-base-add-debug_on-and-debug_off-functions.patch b/0027-base-add-debug_on-and-debug_off-functions.patch
index 69f712d..8f767ef 100644
--- a/0027-base-add-debug_on-and-debug_off-functions.patch
+++ b/0027-base-add-debug_on-and-debug_off-functions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] base: add debug_on() and debug_off() functions
 ---
  modules.d/99base/dracut-lib.sh |   42 +++++++++++++++++++++++++++-------------
  modules.d/99base/init.sh       |    6 ++----
- 2 Dateien geändert, 31 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-)
+ 2 files changed, 31 insertions(+), 17 deletions(-)
 
 diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
 index a29d586..f46c4a7 100755
diff --git a/0028-base-add-export_n-function.patch b/0028-base-add-export_n-function.patch
index 02a5505..614b16f 100644
--- a/0028-base-add-export_n-function.patch
+++ b/0028-base-add-export_n-function.patch
@@ -7,7 +7,7 @@ resembles export -n for dash
 ---
  modules.d/99base/dracut-lib.sh |   13 +++++++++++++
  modules.d/99base/init.sh       |   12 ++++--------
- 2 Dateien geändert, 17 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-)
+ 2 files changed, 17 insertions(+), 8 deletions(-)
 
 diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
 index f46c4a7..a4aa20c 100755
diff --git a/0029-base-dracut-lib.sh-add-arguments-for-source_hook-and.patch b/0029-base-dracut-lib.sh-add-arguments-for-source_hook-and.patch
index 0379099..266428b 100644
--- a/0029-base-dracut-lib.sh-add-arguments-for-source_hook-and.patch
+++ b/0029-base-dracut-lib.sh-add-arguments-for-source_hook-and.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] base/dracut-lib.sh: add arguments for source_hook() and
 
 ---
  modules.d/99base/dracut-lib.sh |   10 +++++++---
- 1 Datei geändert, 7 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
+ 1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
 index a4aa20c..a6b8d1a 100755
diff --git a/0030-merge-cleanup-and-pre-pivot-cleanup-hooks.patch b/0030-merge-cleanup-and-pre-pivot-cleanup-hooks.patch
index 10f7580..102d7e1 100644
--- a/0030-merge-cleanup-and-pre-pivot-cleanup-hooks.patch
+++ b/0030-merge-cleanup-and-pre-pivot-cleanup-hooks.patch
@@ -14,7 +14,7 @@ Subject: [PATCH] merge "cleanup" and "pre-pivot-cleanup" hooks
  modules.d/95iscsi/module-setup.sh     |    2 +-
  modules.d/95nfs/module-setup.sh       |    2 +-
  modules.d/99base/init.sh              |    5 ++---
- 10 Dateien geändert, 13 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-)
+ 10 files changed, 13 insertions(+), 14 deletions(-)
 
 diff --git a/README.modules b/README.modules
 index 188d011..64d533f 100644
diff --git a/0031-network-fix-ifup-and-netroot-calling.patch b/0031-network-fix-ifup-and-netroot-calling.patch
index 000b243..1a8c83d 100644
--- a/0031-network-fix-ifup-and-netroot-calling.patch
+++ b/0031-network-fix-ifup-and-netroot-calling.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] network: fix ifup and netroot calling
  modules.d/40network/net-genrules.sh    |    6 ---
  modules.d/40network/net-lib.sh         |    4 --
  modules.d/40network/netroot.sh         |   27 ++-----------
- 5 Dateien geändert, 48 Zeilen hinzugefügt(+), 86 Zeilen entfernt(-)
+ 5 files changed, 48 insertions(+), 86 deletions(-)
 
 diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
 index 52e4900..dd893c1 100755
diff --git a/0032-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch b/0032-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
index 3093ae4..570eb60 100644
--- a/0032-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
+++ b/0032-ifcfg-write-DNS1-.-for-nameserver-args-RHBZ-815369.patch
@@ -11,7 +11,7 @@ Thanks to Mark Hamzy <hamzy@us.ibm.com>
 and Will Woods <wwoods@redhat.com> for the patch.
 ---
  modules.d/45ifcfg/write-ifcfg.sh |    5 +++++
- 1 Datei geändert, 5 Zeilen hinzugefügt(+)
+ 1 file changed, 5 insertions(+)
 
 diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
 index c072a13..b81ac39 100755
diff --git a/0033-iscsi-module-setup.sh-fix-host-only-mount-checks.patch b/0033-iscsi-module-setup.sh-fix-host-only-mount-checks.patch
index d51c1a2..4f6deeb 100644
--- a/0033-iscsi-module-setup.sh-fix-host-only-mount-checks.patch
+++ b/0033-iscsi-module-setup.sh-fix-host-only-mount-checks.patch
@@ -5,7 +5,7 @@ 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(-)
+ 1 file changed, 6 insertions(+), 10 deletions(-)
 
 diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
 index 2f343ee..bfd9d73 100755
diff --git a/0034-multipath-module-setup.sh-fix-host-only-mount-checks.patch b/0034-multipath-module-setup.sh-fix-host-only-mount-checks.patch
index 6b9f8b1..669cc3e 100644
--- a/0034-multipath-module-setup.sh-fix-host-only-mount-checks.patch
+++ b/0034-multipath-module-setup.sh-fix-host-only-mount-checks.patch
@@ -5,7 +5,7 @@ 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(-)
+ 1 file changed, 7 insertions(+), 9 deletions(-)
 
 diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
 index 2bc1b41..2af112a 100755
diff --git a/0035-udev-rules-module-setup.sh-fixed-udevd-location.patch b/0035-udev-rules-module-setup.sh-fixed-udevd-location.patch
index ea3b46a..daed80f 100644
--- a/0035-udev-rules-module-setup.sh-fixed-udevd-location.patch
+++ b/0035-udev-rules-module-setup.sh-fixed-udevd-location.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] udev-rules/module-setup.sh: fixed udevd location
 
 ---
  modules.d/95udev-rules/module-setup.sh |   24 ++++++++----------------
- 1 Datei geändert, 8 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-)
+ 1 file changed, 8 insertions(+), 16 deletions(-)
 
 diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
 index cc42eb7..b4acce3 100755
diff --git a/0036-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch b/0036-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch
index b20757e..6f53376 100644
--- a/0036-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch
+++ b/0036-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] TEST-15-BTRFSRAID: add one more partition to the btrfs
 ---
  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(-)
+ 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
 index 60dd319..3debf33 100755
diff --git a/0037-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch b/0037-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
index db481e9..e5a028d 100644
--- a/0037-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
+++ b/0037-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
@@ -13,7 +13,7 @@ This is a serious problem if you have (e.g.) "ip=eth0:dhcp" in
 you have two configurations for eth0.
 ---
  modules.d/99base/dracut-lib.sh |    1 +
- 1 Datei geändert, 1 Zeile hinzugefügt(+)
+ 1 file changed, 1 insertion(+)
 
 diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
 index a6b8d1a..ddb6954 100755
diff --git a/0038-ifcfg-fix-resolv.conf.patch b/0038-ifcfg-fix-resolv.conf.patch
index e966f10..8b12374 100644
--- a/0038-ifcfg-fix-resolv.conf.patch
+++ b/0038-ifcfg-fix-resolv.conf.patch
@@ -6,7 +6,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 +-
- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
 index b81ac39..f612762 100755
diff --git a/0039-TODO-update.patch b/0039-TODO-update.patch
index e9569e1..086b9ab 100644
--- a/0039-TODO-update.patch
+++ b/0039-TODO-update.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] TODO: update
 
 ---
  TODO |    2 ++
- 1 Datei geändert, 2 Zeilen hinzugefügt(+)
+ 1 file changed, 2 insertions(+)
 
 diff --git a/TODO b/TODO
 index 6c27268..81121de 100644
diff --git a/0040-removed-old-udev-vol_id.patch b/0040-removed-old-udev-vol_id.patch
index 10c4e63..19b0da4 100644
--- a/0040-removed-old-udev-vol_id.patch
+++ b/0040-removed-old-udev-vol_id.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] removed old udev "vol_id"
  modules.d/90mdraid/module-setup.sh                       |   14 ++++++--------
  modules.d/95udev-rules/59-persistent-storage-volid.rules |    7 -------
  modules.d/95udev-rules/module-setup.sh                   |    9 ++-------
- 6 Dateien geändert, 10 Zeilen hinzugefügt(+), 38 Zeilen entfernt(-)
+ 6 files changed, 10 insertions(+), 38 deletions(-)
  delete mode 100644 modules.d/95udev-rules/59-persistent-storage-volid.rules
 
 diff --git a/dracut-functions.sh b/dracut-functions.sh
diff --git a/0041-plymouth-plymouth-pretrigger.sh-check-for-tty-dev-ex.patch b/0041-plymouth-plymouth-pretrigger.sh-check-for-tty-dev-ex.patch
index 32b8355..5c3f183 100644
--- a/0041-plymouth-plymouth-pretrigger.sh-check-for-tty-dev-ex.patch
+++ b/0041-plymouth-plymouth-pretrigger.sh-check-for-tty-dev-ex.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] plymouth/plymouth-pretrigger.sh: check for tty dev existence
 
 ---
  modules.d/50plymouth/plymouth-pretrigger.sh |    4 ++--
- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
 index 50828af..8fa0aec 100755
diff --git a/0042-dracut.spec-require-file.patch b/0042-dracut.spec-require-file.patch
index a255d34..a34e65b 100644
--- a/0042-dracut.spec-require-file.patch
+++ b/0042-dracut.spec-require-file.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut.spec: require "file"
 
 ---
  dracut.spec |    1 +
- 1 Datei geändert, 1 Zeile hinzugefügt(+)
+ 1 file changed, 1 insertion(+)
 
 diff --git a/dracut.spec b/dracut.spec
 index 9f64213..77b197e 100644
diff --git a/0043-test-TEST-01-BASIC-test.sh-fix-cleanup-of-overlay-di.patch b/0043-test-TEST-01-BASIC-test.sh-fix-cleanup-of-overlay-di.patch
index 30d71f1..ebb0030 100644
--- a/0043-test-TEST-01-BASIC-test.sh-fix-cleanup-of-overlay-di.patch
+++ b/0043-test-TEST-01-BASIC-test.sh-fix-cleanup-of-overlay-di.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] test/TEST-01-BASIC/test.sh: fix cleanup of overlay dir
 
 ---
  test/TEST-01-BASIC/test.sh |    2 +-
- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
 index 6187144..36d2693 100755
diff --git a/0044-plymouth-plymouth-pretrigger.sh-get-consoledev-from-.patch b/0044-plymouth-plymouth-pretrigger.sh-get-consoledev-from-.patch
index 3bf8de8..1c0bb9b 100644
--- a/0044-plymouth-plymouth-pretrigger.sh-get-consoledev-from-.patch
+++ b/0044-plymouth-plymouth-pretrigger.sh-get-consoledev-from-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] plymouth/plymouth-pretrigger.sh: get consoledev from
 
 ---
  modules.d/50plymouth/plymouth-pretrigger.sh |    2 +-
- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
 index 8fa0aec..483cc70 100755
diff --git a/0045-base-init.sh-set-DRACUT_QUIET-only-in-dracut-lib.sh.patch b/0045-base-init.sh-set-DRACUT_QUIET-only-in-dracut-lib.sh.patch
index df63bc6..bcb0942 100644
--- a/0045-base-init.sh-set-DRACUT_QUIET-only-in-dracut-lib.sh.patch
+++ b/0045-base-init.sh-set-DRACUT_QUIET-only-in-dracut-lib.sh.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] base/init.sh: set DRACUT_QUIET only in dracut-lib.sh
 ---
  modules.d/99base/dracut-lib.sh |    3 +++
  modules.d/99base/init.sh       |    6 ------
- 2 Dateien geändert, 3 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-)
+ 2 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
 index ddb6954..e46e456 100755
diff --git a/0046-base-dracut-lib.sh-export-UDEVVERSION.patch b/0046-base-dracut-lib.sh-export-UDEVVERSION.patch
index 69f16a0..ad91872 100644
--- a/0046-base-dracut-lib.sh-export-UDEVVERSION.patch
+++ b/0046-base-dracut-lib.sh-export-UDEVVERSION.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] base/dracut-lib.sh: export UDEVVERSION
 
 ---
  modules.d/99base/dracut-lib.sh |    4 ++--
- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
 index e46e456..2fe8a5e 100755
diff --git a/0047-dracut.sh-install-var-run-and-var-lock.patch b/0047-dracut.sh-install-var-run-and-var-lock.patch
index 44cad11..29b3fac 100644
--- a/0047-dracut.sh-install-var-run-and-var-lock.patch
+++ b/0047-dracut.sh-install-var-run-and-var-lock.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut.sh: install var/run and var/lock
 
 ---
  dracut.sh |    2 +-
- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dracut.sh b/dracut.sh
 index 1048e75..2a7a812 100755
diff --git a/0048-rootfs-block-block-genrules.sh-install-systemd-mount.patch b/0048-rootfs-block-block-genrules.sh-install-systemd-mount.patch
index 0cb13e8..30ba56d 100644
--- a/0048-rootfs-block-block-genrules.sh-install-systemd-mount.patch
+++ b/0048-rootfs-block-block-genrules.sh-install-systemd-mount.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] rootfs-block/block-genrules.sh: install systemd mount unit
 
 ---
  modules.d/95rootfs-block/block-genrules.sh |   17 +++++++++++++++++
- 1 Datei geändert, 17 Zeilen hinzugefügt(+)
+ 1 file changed, 17 insertions(+)
 
 diff --git a/modules.d/95rootfs-block/block-genrules.sh b/modules.d/95rootfs-block/block-genrules.sh
 index 1e6827a..fe6e331 100755
diff --git a/0049-add-systemd-module.patch b/0049-add-systemd-module.patch
index 329011a..e89959d 100644
--- a/0049-add-systemd-module.patch
+++ b/0049-add-systemd-module.patch
@@ -25,7 +25,7 @@ Subject: [PATCH] add systemd module
  test/TEST-02-SYSTEMD/hard-off.sh               |    3 +
  test/TEST-02-SYSTEMD/test-init.sh              |   20 ++++
  test/TEST-02-SYSTEMD/test.sh                   |   95 +++++++++++++++
- 21 Dateien geändert, 747 Zeilen hinzugefügt(+)
+ 21 files changed, 747 insertions(+)
  create mode 100755 modules.d/98systemd/dracut-cmdline.sh
  create mode 100644 modules.d/98systemd/dracut-initqueue.service
  create mode 100755 modules.d/98systemd/dracut-initqueue.sh
diff --git a/0050-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch b/0050-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch
index bb1e688..0c41df7 100644
--- a/0050-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch
+++ b/0050-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch
@@ -6,7 +6,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 +++++-
- 1 Datei geändert, 5 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
 index f612762..580fbd4 100755
diff --git a/0051-dracut.spec-add-98systemd-module.patch b/0051-dracut.spec-add-98systemd-module.patch
index 1032c89..92c85ee 100644
--- a/0051-dracut.spec-add-98systemd-module.patch
+++ b/0051-dracut.spec-add-98systemd-module.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] dracut.spec: add 98systemd module
 
 ---
  dracut.spec |    1 +
- 1 Datei geändert, 1 Zeile hinzugefügt(+)
+ 1 file changed, 1 insertion(+)
 
 diff --git a/dracut.spec b/dracut.spec
 index 77b197e..73c66b5 100644
diff --git a/0052-Fail-to-boot-if-mediacheck-fails-817419.patch b/0052-Fail-to-boot-if-mediacheck-fails-817419.patch
new file mode 100644
index 0000000..f2f6fee
--- /dev/null
+++ b/0052-Fail-to-boot-if-mediacheck-fails-817419.patch
@@ -0,0 +1,23 @@
+From 37427748d1846a68b8655b9cc8394f22b7d34975 Mon Sep 17 00:00:00 2001
+From: "Brian C. Lane" <bcl@redhat.com>
+Date: Wed, 9 May 2012 11:15:03 -0700
+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 +-
+ 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
+index 2aaec28..fdbd6f5 100755
+--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+@@ -33,7 +33,7 @@ fi
+ getarg rd.live.check check || check=""
+ if [ -n "$check" ]; then
+     [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+-    checkisomd5 --verbose $livedev || :
++    checkisomd5 --verbose $livedev
+     if [ $? -ne 0 ]; then
+         die "CD check failed!"
+         exit 1
diff --git a/0053-Makefile-call-git2spec.pl-with-LANG-C.patch b/0053-Makefile-call-git2spec.pl-with-LANG-C.patch
new file mode 100644
index 0000000..4ce678d
--- /dev/null
+++ b/0053-Makefile-call-git2spec.pl-with-LANG-C.patch
@@ -0,0 +1,22 @@
+From 53e3244dbafdd583a2487a56e02a2a0108245383 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 10 May 2012 14:30:31 +0200
+Subject: [PATCH] Makefile: call git2spec.pl with LANG=C
+
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 5ce1778..bf51b51 100644
+--- a/Makefile
++++ b/Makefile
+@@ -87,7 +87,7 @@ dracut-$(VERSION).tar.bz2: doc
+ rpm: dracut-$(VERSION).tar.bz2
+ 	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
+ 	cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
+-	$$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
++	LANG=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+ 	(cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
+ 	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
+ 		--define "_rpmdir $$PWD" -ba dracut.spec; ) && \
diff --git a/0054-ifcfg-write-ifcfg.sh-add-s390-specific-configuration.patch b/0054-ifcfg-write-ifcfg.sh-add-s390-specific-configuration.patch
new file mode 100644
index 0000000..5caea20
--- /dev/null
+++ b/0054-ifcfg-write-ifcfg.sh-add-s390-specific-configuration.patch
@@ -0,0 +1,106 @@
+From a82d207b8d0c067ab6f70acb0dc9e47a6f09d3f8 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 10 May 2012 14:31:05 +0200
+Subject: [PATCH] ifcfg/write-ifcfg.sh: add s390 specific configuration
+ options
+
+https://bugzilla.redhat.com/show_bug.cgi?id=811521
+---
+ 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
+index 580fbd4..d1f6fe6 100755
+--- a/modules.d/45ifcfg/write-ifcfg.sh
++++ b/modules.d/45ifcfg/write-ifcfg.sh
+@@ -20,6 +20,68 @@ fi
+ mkdir -m 0755 -p /tmp/ifcfg/
+ mkdir -m 0755 -p /tmp/ifcfg-leases/
+ 
++get_config_line_by_subchannel()
++{
++    local CHANNEL
++    local line
++
++    CHANNELS="$1"
++    while read line; do
++        if strstr "$line" "$CHANNELS"; then
++            echo $line
++            return 0
++        fi
++    done < /etc/ccw.conf
++    return 1
++}
++
++print_s390() {
++    local _netif
++    local SUBCHANNELS
++    local OPTIONS
++    local NETTYPE
++    local CONFIG_LINE
++    local i
++    local channel
++
++    _netif="$1"
++    # if we find ccw channel, then use those, instead of
++    # of the MAC
++    SUBCHANNELS=$({
++        for i in /sys/class/net/$_netif/device/cdev[0-9]*; do
++            [ -e $i ] || continue
++            channel=$(readlink -f $i)
++            echo -n "${channel##*/},"
++        done
++    })
++    [ -n "$SUBCHANNELS" ] || return 1
++
++    SUBCHANNELS=${SUBCHANNELS%,}
++    echo "SUBCHANNELS=\"${SUBCHANNELS}\""
++    CONFIG_LINE=$(get_config_line_by_subchannel $SUBCHANNELS)
++
++    [ $? -ne 0 -o -z "$CONFIG_LINE" ] && return
++
++    IFS=","
++    set $CONFIG_LINE
++    IFS="$OLD_IFS"
++    NETTYPE=$1
++    shift
++    SUBCHANNELS="$1"
++    OPTIONS=""
++    shift
++    while [ $# -gt 0 ]; do
++        case $1 in
++            *=*) OPTIONS="$OPTIONS $1";;
++        esac
++        shift
++    done
++    OPTIONS=${OPTIONS## }
++    echo "NETTYPE=\"${NETTYPE}\""
++    echo "OPTIONS=\"${OPTIONS}\""
++}
++
++
+ for netif in $IFACES ; do
+     # bridge?
+     unset bridge
+@@ -38,7 +100,6 @@ for netif in $IFACES ; do
+         echo "ONBOOT=yes"
+         echo "NETBOOT=yes"
+         echo "UUID=$uuid"
+-        [ -n "$macaddr" ] && echo "MACADDR=$macaddr"
+         [ -n "$mtu" ] && echo "MTU=$mtu"
+         if [ -f /tmp/net.$netif.lease ]; then
+             strstr "$ip" '*:*:*' &&
+@@ -63,7 +124,12 @@ for netif in $IFACES ; do
+     if [ -z "$bridge" ] && [ -z "$bond" ]; then
+         # standard interface
+         {
+-            echo "HWADDR=$(cat /sys/class/net/$netif/address)"
++            if [ -n "$macaddr" ]; then
++                echo "MACADDR=$macaddr"
++            else
++                echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\""
++            fi
++            print_s390 $netif
+             echo "TYPE=Ethernet"
+             echo "NAME=\"Boot Disk\""
+             [ -n "$mtu" ] && echo "MTU=$mtu"
diff --git a/0055-systemd-adapt-to-new-switch-root-mechanism.patch b/0055-systemd-adapt-to-new-switch-root-mechanism.patch
new file mode 100644
index 0000000..9684255
--- /dev/null
+++ b/0055-systemd-adapt-to-new-switch-root-mechanism.patch
@@ -0,0 +1,128 @@
+From f72318243c7e5145393b2c9830779426a124cf83 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Tue, 15 May 2012 18:57:29 +0200
+Subject: [PATCH] systemd: adapt to new switch-root mechanism
+
+---
+ modules.d/98systemd/dracut-initqueue.sh |    3 ++-
+ modules.d/98systemd/dracut-pre-pivot.sh |   15 ++++-----------
+ modules.d/98systemd/emergency.service   |    2 +-
+ modules.d/98systemd/module-setup.sh     |   10 +++++-----
+ modules.d/98systemd/rescue.service      |    2 +-
+ test/TEST-02-SYSTEMD/test.sh            |    2 +-
+ 6 files changed, 14 insertions(+), 20 deletions(-)
+
+diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
+index 402f536..5b6994d 100755
+--- a/modules.d/98systemd/dracut-initqueue.sh
++++ b/modules.d/98systemd/dracut-initqueue.sh
+@@ -106,6 +106,7 @@ done
+     while read dev mp rest; do [ "$mp" = "$NEWROOT" ] && echo $dev; done < /proc/mounts
+ } | vinfo
+ 
+-systemctl switch-root
+ 
+ export -p > /dracut-state.sh
++
++systemctl isolate switch-root.target
+diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh
+index 5ee1dd0..0d717a6 100755
+--- a/modules.d/98systemd/dracut-pre-pivot.sh
++++ b/modules.d/98systemd/dracut-pre-pivot.sh
+@@ -20,26 +20,19 @@ source_hook cleanup
+ 
+ # By the time we get here, the root filesystem should be mounted.
+ # Try to find init. 
+-for i in "$(getarg real_init=)" "$(getarg init=)" $(getargs rd.distroinit=) /sbin/init; do
++
++for i in "$(getarg real_init=)" "$(getarg init=)"; do
+     [ -n "$i" ] || continue
+ 
+     __p=$(readlink -f "${NEWROOT}/${i}")
+     if [ -x "$__p" ]; then
+         INIT="$i"
++        echo "NEWINIT=\"$INIT\"" > /etc/switch-root.conf
+         break
+     fi
+ done
+ 
+-if [ -n "$INIT" ]; then
+-    {
+-        echo "NEWROOT=\"$NEWROOT\""
+-        echo "NEWINIT=\"$INIT\""
+-    } > /etc/switch-root.conf
+-else
+-    echo "Cannot find init!"
+-    echo "Please check to make sure you passed a valid root filesystem!"
+-    emergency_shell
+-fi
++echo "NEWROOT=\"$NEWROOT\"" >> /etc/switch-root.conf
+ 
+ udevadm control --stop-exec-queue
+ systemctl stop udevd.service
+diff --git a/modules.d/98systemd/emergency.service b/modules.d/98systemd/emergency.service
+index ecebf96..7c705c4 100644
+--- a/modules.d/98systemd/emergency.service
++++ b/modules.d/98systemd/emergency.service
+@@ -17,7 +17,7 @@ Before=shutdown.target
+ Environment=HOME=/
+ WorkingDirectory=/
+ ExecStart=-/bin/sh -i -l
+-ExecStopPost=-/usr/bin/systemctl --fail --no-block switch-root 
++ExecStopPost=-/usr/bin/systemctl --fail --no-block default
+ Type=idle
+ StandardInput=tty-force
+ StandardOutput=inherit
+diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
+index 22e570f..c045af5 100755
+--- a/modules.d/98systemd/module-setup.sh
++++ b/modules.d/98systemd/module-setup.sh
+@@ -114,10 +114,10 @@ install() {
+ 
+     ln -fs /lib/systemd/systemd "$initdir/init"
+ 
+-    {
+-        echo "LogLevel=debug"
+-        echo "LogTarget=console"
+-    } >> "$initdir/etc/systemd/system.conf"
++#    {
++#        echo "LogLevel=debug"
++#        echo "LogTarget=console"
++#    } >> "$initdir/etc/systemd/system.conf"
+ 
+     rm -f "$initdir/lib/systemd/system/emergency.service"
+     inst "$moddir/emergency.service" /lib/systemd/system/emergency.service
+@@ -145,6 +145,6 @@ install() {
+     inst "$moddir/dracut-pre-pivot.service" /lib/systemd/system/dracut-pre-pivot.service
+     mkdir -p "$initdir/lib/systemd/system/switch-root.target.wants"
+     ln -s ../dracut-pre-pivot.service "$initdir/lib/systemd/system/switch-root.target.wants/dracut-pre-pivot.service"
+-    
++    > "$initdir/etc/machine-id" 
+ }
+ 
+diff --git a/modules.d/98systemd/rescue.service b/modules.d/98systemd/rescue.service
+index 057f8b4..652308c 100644
+--- a/modules.d/98systemd/rescue.service
++++ b/modules.d/98systemd/rescue.service
+@@ -19,7 +19,7 @@ Environment=HOME=/
+ WorkingDirectory=/
+ ExecStart=-/bin/sh -i -l
+ #ExecStopPost=-/usr/bin/systemctl --fail --no-block switch-root /sysroot /sbin/init
+-ExecStopPost=-/usr/bin/systemctl --fail --no-block switch-root
++ExecStopPost=-/usr/bin/systemctl --fail --no-block default
+ Type=idle
+ StandardInput=tty-force
+ StandardOutput=inherit
+diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
+index fe3bfd1..334b636 100755
+--- a/test/TEST-02-SYSTEMD/test.sh
++++ b/test/TEST-02-SYSTEMD/test.sh
+@@ -10,7 +10,7 @@ test_run() {
+ 	-hda $TESTDIR/root.ext3 \
+ 	-m 256M -nographic \
+ 	-net none -kernel /boot/vmlinuz-$KVERSION \
+-	-append "root=LABEL=dracut rw loglevel=77 systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
++	-append "root=LABEL=dracut rw loglevel=77 systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug init=/sbin/init $DEBUGFAIL" \
+ 	-initrd $TESTDIR/initramfs.testing
+     grep -m 1 -q dracut-root-block-success $TESTDIR/root.ext3 || return 1
+ }
diff --git a/0056-base-module-setup.sh-link-proc-self-mounts-to-initdi.patch b/0056-base-module-setup.sh-link-proc-self-mounts-to-initdi.patch
new file mode 100644
index 0000000..9a3be9a
--- /dev/null
+++ b/0056-base-module-setup.sh-link-proc-self-mounts-to-initdi.patch
@@ -0,0 +1,21 @@
+From 832d85cbbc70bf3a6029faac45e7398d4b6ff179 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Tue, 15 May 2012 19:03:50 +0200
+Subject: [PATCH] base/module-setup.sh: link /proc/self/mounts to
+ $initdir/etc/mtab
+
+---
+ modules.d/99base/module-setup.sh |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
+index 581ba93..8bf3d4d 100755
+--- a/modules.d/99base/module-setup.sh
++++ b/modules.d/99base/module-setup.sh
+@@ -48,5 +48,6 @@ install() {
+         done > "${initdir}/etc/cmdline.d/distroinit.conf"
+     fi
+ 
++    ln -s /proc/self/mounts "$initdir/etc/mtab"
+ }
+ 
diff --git a/0057-systemd-dracut-pre-pivot.sh-s-udevd.service-systemd-.patch b/0057-systemd-dracut-pre-pivot.sh-s-udevd.service-systemd-.patch
new file mode 100644
index 0000000..793c6ca
--- /dev/null
+++ b/0057-systemd-dracut-pre-pivot.sh-s-udevd.service-systemd-.patch
@@ -0,0 +1,23 @@
+From 022c5a802f2cbba9fd11903ed616cee7648b2f63 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 16 May 2012 11:20:59 +0200
+Subject: [PATCH] systemd/dracut-pre-pivot.sh:
+ s/udevd.service/systemd-udev.service/
+
+---
+ modules.d/98systemd/dracut-pre-pivot.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh
+index 0d717a6..272b293 100755
+--- a/modules.d/98systemd/dracut-pre-pivot.sh
++++ b/modules.d/98systemd/dracut-pre-pivot.sh
+@@ -35,7 +35,7 @@ done
+ echo "NEWROOT=\"$NEWROOT\"" >> /etc/switch-root.conf
+ 
+ udevadm control --stop-exec-queue
+-systemctl stop udevd.service
++systemctl stop systemd-udev.service
+ udevadm info --cleanup-db
+ 
+ # remove helper symlink
diff --git a/0058-systemd-switch-root.target-run-target-before-switch-.patch b/0058-systemd-switch-root.target-run-target-before-switch-.patch
new file mode 100644
index 0000000..809a614
--- /dev/null
+++ b/0058-systemd-switch-root.target-run-target-before-switch-.patch
@@ -0,0 +1,22 @@
+From 3df23069817586aa3143e6e9c33bec24785caea3 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 16 May 2012 11:21:33 +0200
+Subject: [PATCH] systemd/switch-root.target: run target before
+ switch-root.service
+
+---
+ modules.d/98systemd/switch-root.target |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/98systemd/switch-root.target b/modules.d/98systemd/switch-root.target
+index d0d60e1..adfb32c 100644
+--- a/modules.d/98systemd/switch-root.target
++++ b/modules.d/98systemd/switch-root.target
+@@ -11,6 +11,6 @@
+ Description=Switch Root
+ DefaultDependencies=no
+ Requires=switch-root.service
+-After=switch-root.service
++Before=switch-root.service
+ AllowIsolate=yes
+ 
diff --git a/0059-systemd-switch-root.service-do-not-require-shutdown-.patch b/0059-systemd-switch-root.service-do-not-require-shutdown-.patch
new file mode 100644
index 0000000..666ea14
--- /dev/null
+++ b/0059-systemd-switch-root.service-do-not-require-shutdown-.patch
@@ -0,0 +1,30 @@
+From 41153ca4f2163d2ede2d269e2a5388d7a4b73621 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 16 May 2012 11:22:28 +0200
+Subject: [PATCH] systemd/switch-root.service: do not require shutdown and
+ isolate to default
+
+do not require shutdown.target and final.target
+
+After switch-root isolate to the default target. This will load the
+default target in the real root after systemd deserializes.
+---
+ modules.d/98systemd/switch-root.service |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules.d/98systemd/switch-root.service b/modules.d/98systemd/switch-root.service
+index f72739e..0c41eb0 100644
+--- a/modules.d/98systemd/switch-root.service
++++ b/modules.d/98systemd/switch-root.service
+@@ -8,10 +8,9 @@
+ [Unit]
+ Description=Switch Root
+ DefaultDependencies=no
+-Requires=shutdown.target final.target
+-After=shutdown.target final.target
+ 
+ [Service]
+ Type=oneshot
+ EnvironmentFile=/etc/switch-root.conf
+ ExecStart=/usr/bin/systemctl --force switch-root ${NEWROOT} ${NEWINIT}
++ExecStopPost=-/usr/bin/systemctl isolate default.target
diff --git a/0060-systemd-store-switch-root.conf-in-run-initramfs.patch b/0060-systemd-store-switch-root.conf-in-run-initramfs.patch
new file mode 100644
index 0000000..de87499
--- /dev/null
+++ b/0060-systemd-store-switch-root.conf-in-run-initramfs.patch
@@ -0,0 +1,43 @@
+From 38111b96223816bdc48930830f59d0fc674db895 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 16 May 2012 11:24:42 +0200
+Subject: [PATCH] systemd: store switch-root.conf in /run/initramfs
+
+Store switch-root.conf in /run/initramfs/switch-root.conf, so that the
+service does not fail in ExecPost after switching to the real root.
+---
+ modules.d/98systemd/dracut-pre-pivot.sh |    4 ++--
+ modules.d/98systemd/switch-root.service |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh
+index 272b293..a8e9fc1 100755
+--- a/modules.d/98systemd/dracut-pre-pivot.sh
++++ b/modules.d/98systemd/dracut-pre-pivot.sh
+@@ -27,12 +27,12 @@ for i in "$(getarg real_init=)" "$(getarg init=)"; do
+     __p=$(readlink -f "${NEWROOT}/${i}")
+     if [ -x "$__p" ]; then
+         INIT="$i"
+-        echo "NEWINIT=\"$INIT\"" > /etc/switch-root.conf
++        echo "NEWINIT=\"$INIT\"" > /run/initramfs/switch-root.conf
+         break
+     fi
+ done
+ 
+-echo "NEWROOT=\"$NEWROOT\"" >> /etc/switch-root.conf
++echo "NEWROOT=\"$NEWROOT\"" >> /run/initramfs/switch-root.conf
+ 
+ udevadm control --stop-exec-queue
+ systemctl stop systemd-udev.service
+diff --git a/modules.d/98systemd/switch-root.service b/modules.d/98systemd/switch-root.service
+index 0c41eb0..2abfc90 100644
+--- a/modules.d/98systemd/switch-root.service
++++ b/modules.d/98systemd/switch-root.service
+@@ -11,6 +11,6 @@ DefaultDependencies=no
+ 
+ [Service]
+ Type=oneshot
+-EnvironmentFile=/etc/switch-root.conf
++EnvironmentFile=/run/initramfs/switch-root.conf
+ ExecStart=/usr/bin/systemctl --force switch-root ${NEWROOT} ${NEWINIT}
+ ExecStopPost=-/usr/bin/systemctl isolate default.target
diff --git a/0061-Makefile-install-dracut-service-files-from-systemd-d.patch b/0061-Makefile-install-dracut-service-files-from-systemd-d.patch
new file mode 100644
index 0000000..6d0d874
--- /dev/null
+++ b/0061-Makefile-install-dracut-service-files-from-systemd-d.patch
@@ -0,0 +1,45 @@
+From afd1fd8d412aa6f99ef9afa30ab15ae5d3314e1e Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 16 May 2012 11:28:42 +0200
+Subject: [PATCH] Makefile: install dracut service files from systemd dracut
+ module
+
+---
+ Makefile    |   11 ++++++++++-
+ dracut.spec |    1 +
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index bf51b51..d9068c5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,16 @@ install: doc
+ 	ln -s dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7
+ 	if [ -n "$(systemdsystemunitdir)" ]; then \
+ 		mkdir -p $(DESTDIR)$(systemdsystemunitdir); \
+-		install -m 0644 dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir); \
++		for i in \
++			modules.d/98systemd/dracut-initqueue.service \
++			modules.d/98systemd/dracut-pre-pivot.service \
++			modules.d/98systemd/dracut-pre-trigger.service \
++			modules.d/98systemd/dracut-pre-udev.service \
++			modules.d/98systemd/switch-root.service \
++			modules.d/98systemd/switch-root.target \
++			dracut-shutdown.service; do \
++				install -m 0644 $$i $(DESTDIR)$(systemdsystemunitdir); \
++		done; \
+ 		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants; \
+ 		ln -s ../dracut-shutdown.service \
+ 		$(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
+diff --git a/dracut.spec b/dracut.spec
+index 73c66b5..201da0d 100644
+--- a/dracut.spec
++++ b/dracut.spec
+@@ -301,6 +301,7 @@ rm -rf $RPM_BUILD_ROOT
+ %dir %{_sharedstatedir}/initramfs
+ %if %{defined _unitdir}
+ %{_unitdir}/*.service
++%{_unitdir}/*.target
+ %{_unitdir}/*/*.service
+ %endif
+ 
diff --git a/0062-90kernel-modules-module-setup.sh-install-xhci-hcd.patch b/0062-90kernel-modules-module-setup.sh-install-xhci-hcd.patch
new file mode 100644
index 0000000..80026fa
--- /dev/null
+++ b/0062-90kernel-modules-module-setup.sh-install-xhci-hcd.patch
@@ -0,0 +1,23 @@
+From 40913ad2199913eda4c61509348cb3f2a66d903c Mon Sep 17 00:00:00 2001
+From: Olivier Blin <dev@blino.org>
+Date: Thu, 10 May 2012 22:58:22 +0200
+Subject: [PATCH] 90kernel-modules/module-setup.sh: install xhci-hcd
+
+to allow booting and using kbd devices from USB 3.0
+---
+ 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 26f4784..97e1de8 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -36,7 +36,7 @@ installkernel() {
+         hostonly='' instmods usb_storage sdhci sdhci-pci
+ 
+         # install keyboard support
+-        hostonly='' instmods atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech hid-logitech-dj hid-microsoft ehci-hcd ohci-hcd uhci-hcd
++        hostonly='' instmods atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech hid-logitech-dj hid-microsoft ehci-hcd ohci-hcd uhci-hcd xhci-hcd
+         # install unix socket support
+         hostonly='' instmods unix
+         instmods "=drivers/pcmcia" =ide "=drivers/usb/storage"
diff --git a/0063-check-kernel-module-existance.patch b/0063-check-kernel-module-existance.patch
new file mode 100644
index 0000000..1d8ef28
--- /dev/null
+++ b/0063-check-kernel-module-existance.patch
@@ -0,0 +1,141 @@
+From a6d3be9dd5e105c926b753fc3a26f0a91119c2a4 Mon Sep 17 00:00:00 2001
+From: Cong Wang <xiyou.wangcong@gmail.com>
+Date: Tue, 15 May 2012 14:19:56 +0800
+Subject: [PATCH] check kernel module existance
+
+This patch adds check of kernel module existance and
+propagate errors to upper callers.
+
+In case of break other callers of instmods(), this patch
+adds an option '-c' to it, only when "-c" is specified
+we fail, otherwise, errors are ignored.
+
+Reported-by: Dave Young <dyoung@redhat.com>
+Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
+Cc: Harald Hoyer <harald@redhat.com>
+---
+ dracut-functions.sh                        |   37 +++++++++++++++++++++-------
+ dracut.sh                                  |   10 ++++++--
+ modules.d/90kernel-modules/module-setup.sh |    8 ++++--
+ 3 files changed, 42 insertions(+), 13 deletions(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 8256e02..4fe428e 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -1108,17 +1108,22 @@ find_kernel_modules () {
+     find_kernel_modules_by_path  drivers
+ }
+ 
+-# instmods <kernel module> [<kernel module> ... ]
+-# instmods <kernel subsystem>
++# instmods [-c] <kernel module> [<kernel module> ... ]
++# instmods [-c] <kernel subsystem>
+ # install kernel modules along with all their dependencies.
+ # <kernel subsystem> can be e.g. "=block" or "=drivers/usb/storage"
+ instmods() {
+     [[ $no_kernel = yes ]] && return
+     # called [sub]functions inherit _fderr
+     local _fderr=9
++    local _check=no
++    if [[ $1 = '-c' ]]; then
++        _check=yes
++        shift
++    fi
+ 
+     function inst1mod() {
+-        local _mod="$1"
++        local _ret=0 _mod="$1"
+         case $_mod in
+             =*)
+                 if [ -f $srcmods/modules.${_mod#=} ]; then
+@@ -1162,26 +1167,40 @@ instmods() {
+                 ((_ret+=$?))
+                 ;;
+         esac
++        return $_ret
+     }
+ 
+     function instmods_1() {
+-        local _ret=0 _mod _mpargs
++        local _mod _mpargs
+         if (($# == 0)); then  # filenames from stdin
+             while read _mod; do
+-                inst1mod "${_mod%.ko*}"
++                inst1mod "${_mod%.ko*}" || {
++                    if [ "$_check" = "yes" ]; then
++                        dfatal "Failed to install $_mod"
++                        return 1
++                    fi
++                }
+             done
+         fi
+         while (($# > 0)); do  # filenames as arguments
+-            inst1mod ${1%.ko*}
++            inst1mod ${1%.ko*} || {
++                if [ "$_check" = "yes" ]; then
++                    dfatal "Failed to install $1"
++                    return 1
++                fi
++            }
+             shift
+         done
+-        return $_ret
++        return 0
+     }
+ 
+-    local _filter_not_found='FATAL: Module .* not found.'
++    local _ret _filter_not_found='FATAL: Module .* not found.'
++    set -o pipefail
+     # Capture all stderr from modprobe to _fderr. We could use {var}>...
+     # redirections, but that would make dracut require bash4 at least.
+     eval "( instmods_1 \"\$@\" ) ${_fderr}>&1" \
+     | while read line; do [[ "$line" =~ $_filter_not_found ]] || echo $line;done | derror
+-    return $?
++    _ret=$?
++    set +o pipefail
++    return $_ret
+ }
+diff --git a/dracut.sh b/dracut.sh
+index 2a7a812..315b965 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -708,11 +708,17 @@ for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
+         [[ $show_modules = yes ]] && echo "$_d_mod" || \
+             dinfo "*** Including module: $_d_mod ***"
+         if [[ $kernel_only = yes ]]; then
+-            module_installkernel $_d_mod
++            module_installkernel $_d_mod || {
++                dfatal "installkernel failed in module $_d_mod"
++                exit 1
++            }
+         else
+             module_install $_d_mod
+             if [[ $no_kernel != yes ]]; then
+-                module_installkernel $_d_mod
++                module_installkernel $_d_mod || {
++                    dfatal "installkernel failed in module $_d_mod"
++                    exit 1
++                }
+             fi
+         fi
+         mods_to_load=${mods_to_load// $_d_mod /}
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 97e1de8..b91785e 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -58,8 +58,12 @@ installkernel() {
+         hostonly='' instmods $drivers
+     fi
+ 
+-    [[ $add_drivers ]] && hostonly='' instmods $add_drivers
+-    [[ $filesystems ]] && hostonly='' instmods $filesystems
++    if [[ $add_drivers ]]; then
++        hostonly='' instmods -c $add_drivers || return 1
++    fi
++    if [[ $filesystems ]]; then
++        hostonly='' instmods -c $filesystems || return 1
++    fi
+ 
+     # force install of scsi_wait_scan
+     hostonly='' instmods scsi_wait_scan
diff --git a/0064-check-install-files-passed-by-cmdline.patch b/0064-check-install-files-passed-by-cmdline.patch
new file mode 100644
index 0000000..686896c
--- /dev/null
+++ b/0064-check-install-files-passed-by-cmdline.patch
@@ -0,0 +1,35 @@
+From bd4be59fb2574b8cbcdf22a86a6cafb7b71db503 Mon Sep 17 00:00:00 2001
+From: Cong Wang <xiyou.wangcong@gmail.com>
+Date: Tue, 15 May 2012 14:19:57 +0800
+Subject: [PATCH] check install files passed by cmdline
+
+We should not trust cmdline passed by users, always
+check the install files passed from cmdline. This restores
+the old behaviour which was changed by:
+
+	commit c6c6a08850c7e4ee211696895f7ca3864be85052
+	Author: Harald Hoyer <harald@redhat.com>
+	Date:   Tue Feb 7 18:26:30 2012 +0100
+
+	    add "install_items" to dracut.conf
+
+Reported-by: Dave Young <dyoung@redhat.com>
+Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
+Cc: Harald Hoyer <harald@redhat.com>
+---
+ dracut.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 315b965..bf9e79f 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -770,7 +770,7 @@ done
+ 
+ if [[ $kernel_only != yes ]]; then
+     for item in $install_items; do
+-        dracut_install -o "$item"
++        dracut_install "$item"
+     done
+     unset item
+ 
diff --git a/0065-dracut-fstab-sys-Wait-for-devices-specified-using-mo.patch b/0065-dracut-fstab-sys-Wait-for-devices-specified-using-mo.patch
new file mode 100644
index 0000000..65a663c
--- /dev/null
+++ b/0065-dracut-fstab-sys-Wait-for-devices-specified-using-mo.patch
@@ -0,0 +1,70 @@
+From 8be5a0fa945d130ef8ebb464ebbe1a865949353d Mon Sep 17 00:00:00 2001
+From: Vivek Goyal <vgoyal@redhat.com>
+Date: Tue, 15 May 2012 13:36:11 -0400
+Subject: [PATCH] dracut:fstab-sys: Wait for devices specified using --mount
+ option
+
+dracut allows passing --mount option which mounts the specified devices.
+But it does not wait for these devices to show up and mounting will fail
+if devices do not show up by the time "mount" was called.
+
+I am writing some patches to support kdump on iscsi target and I noticed
+that one of the initqueue script was not called as we found the root
+device and broke out of main loop.
+
+There are two possible enancements to this patch.
+
+- Introduce a time limited wait (rd.timeout something along the lines of
+  rd.retry). That will allow kdump to try to dump to a backup target if
+  primary targets fails to come up.
+
+- Wait for UUID= and LABEL= to show up too. Right now kdump converts
+  UUID= and LABEL= to respective devices and passes /dev/* to dracut
+  --mount option. So I am not introducing the wait for UUID= or LABEL=
+ in this patch.
+
+Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
+---
+ modules.d/95fstab-sys/module-setup.sh   |    1 +
+ modules.d/95fstab-sys/wait-mount-dev.sh |   22 ++++++++++++++++++++++
+ 2 files changed, 23 insertions(+)
+ create mode 100644 modules.d/95fstab-sys/wait-mount-dev.sh
+
+diff --git a/modules.d/95fstab-sys/module-setup.sh b/modules.d/95fstab-sys/module-setup.sh
+index 7589d74..56dd8fc 100755
+--- a/modules.d/95fstab-sys/module-setup.sh
++++ b/modules.d/95fstab-sys/module-setup.sh
+@@ -13,4 +13,5 @@ depends() {
+ install() {
+     [ -f /etc/fstab.sys ] && inst /etc/fstab.sys
+     inst_hook pre-pivot 00 "$moddir/mount-sys.sh"
++    inst_hook cmdline 00 "$moddir/wait-mount-dev.sh"
+ }
+diff --git a/modules.d/95fstab-sys/wait-mount-dev.sh b/modules.d/95fstab-sys/wait-mount-dev.sh
+new file mode 100644
+index 0000000..99fc16c
+--- /dev/null
++++ b/modules.d/95fstab-sys/wait-mount-dev.sh
+@@ -0,0 +1,22 @@
++#!/bin/sh
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
++
++type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
++type det_fs >/dev/null 2>&1 || . /lib/fs-lib.sh
++
++fstab_wait_dev() {
++    local _dev _mp _fs _opts _dump _pass _rest
++    test -e "$1" || return 1
++    while read _dev _mp _fs _opts _dump _pass _rest; do
++        [ -z "${_dev%%#*}" ] && continue # Skip comment lines
++        case "$_dev" in
++        /dev/?*)
++            wait_for_dev $_dev;;
++        *) ;;
++        esac
++    done < $1
++    return 0
++}
++
++[ -f /etc/fstab ] && fstab_wait_dev /etc/fstab
diff --git a/0066-TEST-01-BASIC-sync-after-creating-the-root-disk.patch b/0066-TEST-01-BASIC-sync-after-creating-the-root-disk.patch
new file mode 100644
index 0000000..710c34d
--- /dev/null
+++ b/0066-TEST-01-BASIC-sync-after-creating-the-root-disk.patch
@@ -0,0 +1,34 @@
+From cfe32ef5ba0be76fecd024b702997d1f46d45e2d Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 16 May 2012 11:51:26 +0200
+Subject: [PATCH] TEST-01-BASIC: sync after creating the root disk
+
+---
+ test/TEST-01-BASIC/create-root.sh |    1 +
+ test/TEST-01-BASIC/test.sh        |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/TEST-01-BASIC/create-root.sh b/test/TEST-01-BASIC/create-root.sh
+index 0e91ab5..046bfb9 100755
+--- a/test/TEST-01-BASIC/create-root.sh
++++ b/test/TEST-01-BASIC/create-root.sh
+@@ -19,5 +19,6 @@ cp -a -t /root /source/*
+ mkdir -p /root/run
+ umount /root
+ echo "dracut-root-block-created" >/dev/sda1
++sync
+ poweroff -f
+ 
+diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
+index 36d2693..46e75c7 100755
+--- a/test/TEST-01-BASIC/test.sh
++++ b/test/TEST-01-BASIC/test.sh
+@@ -48,7 +48,7 @@ test_setup() {
+     (
+ 	initdir=$TESTDIR/overlay
+ 	. $basedir/dracut-functions.sh
+-	dracut_install sfdisk mkfs.ext3 poweroff cp umount
++	dracut_install sfdisk mkfs.ext3 poweroff cp umount sync
+ 	inst_hook initqueue 01 ./create-root.sh
+ 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+     )
diff --git a/0067-add-option-printsize.patch b/0067-add-option-printsize.patch
new file mode 100644
index 0000000..59b058d
--- /dev/null
+++ b/0067-add-option-printsize.patch
@@ -0,0 +1,55 @@
+From ec3c59518d9341b6aa2f59ca2eabbe78274efd23 Mon Sep 17 00:00:00 2001
+From: Dave Young <dyoung@redhat.com>
+Date: Mon, 21 May 2012 16:37:06 +0800
+Subject: [PATCH] add option --printsize
+
+Add --printsize for measuring module installed size to initramfs
+
+Signed-off-by: Dave Young <dyoung@redhat.com>
+---
+ dracut.sh |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/dracut.sh b/dracut.sh
+index bf9e79f..c5151d7 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -123,6 +123,7 @@ Creates initial ramdisk images for preloading modules
+   -M, --show-modules    Print included module's name to standard output during
+                          build.
+   --keep                Keep the temporary initramfs for debugging purposes
++  --printsize           Print out the module install size
+   --sshkey [SSHKEY]     Add ssh key to initramfs (use with ssh-client module)
+ 
+ If [LIST] has multiple arguments, then you have to put these in quotes.
+@@ -268,6 +269,7 @@ while (($# > 0)); do
+                        show_modules_l="yes"
+                        ;;
+         --keep)        keep="yes";;
++        --printsize)   printsize="yes";;
+         -*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;;
+         *)
+             if ! [[ ${outfile+x} ]]; then
+@@ -700,6 +702,7 @@ mods_to_load=""
+ for_each_module_dir check_module
+ for_each_module_dir check_mount
+ 
++_isize=0 #initramfs size
+ modules_loaded=" "
+ # source our modules.
+ for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
+@@ -723,6 +726,14 @@ for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
+         fi
+         mods_to_load=${mods_to_load// $_d_mod /}
+         modules_loaded+="$_d_mod "
++
++        #print the module install size
++        if [ -n "$printsize" ]; then
++            _isize_new=$(du -sk ${initdir}|cut -f1)
++            _isize_delta=$(($_isize_new - $_isize))
++            echo "$_d_mod install size: ${_isize_delta}k"
++            _isize=$_isize_new
++        fi
+     fi
+ done
+ unset moddir
diff --git a/0068-check-ifenslave-instead-of-brctl-in-parse-bond.sh.patch b/0068-check-ifenslave-instead-of-brctl-in-parse-bond.sh.patch
new file mode 100644
index 0000000..2b51508
--- /dev/null
+++ b/0068-check-ifenslave-instead-of-brctl-in-parse-bond.sh.patch
@@ -0,0 +1,26 @@
+From ffc5bf686da7db9d26dd19b43fc8a17d83bcc4d7 Mon Sep 17 00:00:00 2001
+From: WANG Cong <xiyou.wangcong@gmail.com>
+Date: Fri, 18 May 2012 13:38:17 +0800
+Subject: [PATCH] check ifenslave instead of brctl in parse-bond.sh
+
+This is obviously wrong, ifenslave instead of brctl is needed for bonding.
+
+Cc: Harald Hoyer <harald@redhat.com>
+Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
+---
+ modules.d/40network/parse-bond.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/40network/parse-bond.sh b/modules.d/40network/parse-bond.sh
+index 0a4c006..ae0ae97 100755
+--- a/modules.d/40network/parse-bond.sh
++++ b/modules.d/40network/parse-bond.sh
+@@ -18,7 +18,7 @@ if getarg bond= >/dev/null ; then
+     if [ -z "$netroot" ] ; then
+         die "No netboot configured, bond is invalid"
+     fi
+-    command -v brctl >/dev/null 2>&1 || die "No 'brctl' installed"
++    command -v ifenslave >/dev/null 2>&1 || die "No 'ifenslave' installed"
+ fi
+ 
+ # We translate list of slaves to space-separated here to mwke it easier to loop over them in ifup
diff --git a/0069-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch b/0069-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
new file mode 100644
index 0000000..9026e5c
--- /dev/null
+++ b/0069-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
@@ -0,0 +1,24 @@
+From 59aa65c9b26ad5cd8839a52a886723324227e5bc Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Thu, 17 May 2012 01:33:17 -0500
+Subject: [PATCH] ARM: make sure that we get the storage modules into the
+ initramfs
+
+---
+ 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
+index b91785e..f4832c4 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -35,6 +35,9 @@ installkernel() {
+         hostonly='' instmods pcmcia firewire-ohci
+         hostonly='' instmods usb_storage sdhci sdhci-pci
+ 
++        # arm specific modules
++        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap sdhci_dove ahci_platform pata_imx sata_mv
++
+         # install keyboard support
+         hostonly='' instmods atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech hid-logitech-dj hid-microsoft ehci-hcd ohci-hcd uhci-hcd xhci-hcd
+         # install unix socket support
diff --git a/0070-Use-the-right-argument-for-dasd-module-options.patch b/0070-Use-the-right-argument-for-dasd-module-options.patch
new file mode 100644
index 0000000..96f5747
--- /dev/null
+++ b/0070-Use-the-right-argument-for-dasd-module-options.patch
@@ -0,0 +1,42 @@
+From d69514332910847f57c63c636103bb6f757a44a6 Mon Sep 17 00:00:00 2001
+From: Jesse Keating <jkeating@redhat.com>
+Date: Tue, 15 May 2012 13:42:47 -0700
+Subject: [PATCH] Use the right argument for dasd module options
+
+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 +++++++++++++-----
+ 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
+index b550156..d7e8664 100755
+--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
++++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
+@@ -1,12 +1,20 @@
+ #!/bin/sh
+ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+-[ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d
++mod_args=""
++for dasd_arg in $(getargs rd.dasd= rd_DASD= DASD=); do
++    if [ -z $mod_args ]; then
++        mod_args="$dasd_arg"
++    else
++        # We've already got some thing in mod_args, add to it
++        mod_args="$mod_args,$dasd_arg"
++    fi
++done
+ 
+-dasd_arg=$(getarg rd.dasd_mod.dasd rd_DASD_MOD=)
+-if [ -n "$dasd_arg" ]; then
+-    echo "options dasd_mod dasd=$dasd_arg" >> /etc/modprobe.d/dasd_mod.conf
++if [ ! -z $mod_args ]; then
++    [ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d
++    echo "options dasd_mod dasd=$mod_args" >> /etc/modprobe.d/dasd_mod.conf
+ fi
+-unset dasd_arg
+ 
++unset dasd_arg
+ dasd_cio_free
diff --git a/0071-Translate-dasd-arg-contents-into-proper-dasd.conf.patch b/0071-Translate-dasd-arg-contents-into-proper-dasd.conf.patch
new file mode 100644
index 0000000..c676f3b
--- /dev/null
+++ b/0071-Translate-dasd-arg-contents-into-proper-dasd.conf.patch
@@ -0,0 +1,43 @@
+From b0772db56a532e19379ddd4369f3668d3192908c Mon Sep 17 00:00:00 2001
+From: Jesse Keating <jkeating@redhat.com>
+Date: Fri, 18 May 2012 14:06:54 -0700
+Subject: [PATCH] Translate dasd arg contents into proper dasd.conf
+
+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 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/95dasd/module-setup.sh b/modules.d/95dasd/module-setup.sh
+index 88dfc6d..74efc7b 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
++    dracut_install tr dasdinfo dasdconf.sh normalize_dasd_arg
+     if [[ $hostonly ]]; then
+         inst /etc/dasd.conf
+     fi
+diff --git a/modules.d/95dasd/parse-dasd.sh b/modules.d/95dasd/parse-dasd.sh
+index 4aeecd5..b3d18fa 100755
+--- a/modules.d/95dasd/parse-dasd.sh
++++ b/modules.d/95dasd/parse-dasd.sh
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+-for dasd_arg in $(getargs rd.dasd 'rd_DASD='); do
++for dasd_arg in $(getargs rd.dasd= rd_DASD= DASD=); do
+     (
+         IFS=","
+         set $dasd_arg
+-        echo "$@" >> /etc/dasd.conf
++        echo "$@" | normalize_dasd_arg >> /etc/dasd.conf
+     )
+ done
diff --git a/0072-Normalize-dasd-argument-content-for-dasd.conf.patch b/0072-Normalize-dasd-argument-content-for-dasd.conf.patch
new file mode 100644
index 0000000..cc45d5f
--- /dev/null
+++ b/0072-Normalize-dasd-argument-content-for-dasd.conf.patch
@@ -0,0 +1,38 @@
+From 965d14726abc7506e046f86dbf53a8644439e25b Mon Sep 17 00:00:00 2001
+From: Jesse Keating <jkeating@redhat.com>
+Date: Fri, 18 May 2012 14:50:20 -0700
+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 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
+index 6aa456c..995bfa7 100755
+--- a/modules.d/80cms/cmssetup.sh
++++ b/modules.d/80cms/cmssetup.sh
+@@ -169,8 +169,8 @@ processcmsfile()
+     fi
+ 
+     if [[ $DASD ]]; then
+-	echo $DASD >> /etc/dasd.conf
+-	echo "options dasd_mod dasd=$DASD" >> /etc/modprobe.d/dasd_mod.conf
++	echo $DASD | normalize_dasd_arg > /etc/dasd.conf
++	echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf
+ 	dasd_cio_free
+     fi
+ 
+diff --git a/modules.d/80cms/module-setup.sh b/modules.d/80cms/module-setup.sh
+index 5cce1b4..15dce89 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
++    dracut_install cmsfs-fuse fusermount ulockmgr_server bash tr insmod rmmod cat normalize_dasd_arg
+ }
diff --git a/0073-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch b/0073-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch
new file mode 100644
index 0000000..7a2adad
--- /dev/null
+++ b/0073-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch
@@ -0,0 +1,34 @@
+From 02805bd1fc74648e38fccecdfdc5896db47179c4 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+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 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
+index d1f6fe6..2b7cb5c 100755
+--- a/modules.d/45ifcfg/write-ifcfg.sh
++++ b/modules.d/45ifcfg/write-ifcfg.sh
+@@ -43,6 +43,7 @@ print_s390() {
+     local CONFIG_LINE
+     local i
+     local channel
++    local OLD_IFS
+ 
+     _netif="$1"
+     # if we find ccw channel, then use those, instead of
+@@ -62,9 +63,10 @@ print_s390() {
+ 
+     [ $? -ne 0 -o -z "$CONFIG_LINE" ] && return
+ 
++    OLD_IFS=$IFS
+     IFS=","
+-    set $CONFIG_LINE
+-    IFS="$OLD_IFS"
++    set -- $CONFIG_LINE
++    IFS=$OLD_IFS
+     NETTYPE=$1
+     shift
+     SUBCHANNELS="$1"
diff --git a/dracut.spec b/dracut.spec
index 48861db..ca1e7e7 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 018
-Release: 53.git20120509%{?dist}
+Release: 74.git20120522%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -75,7 +75,29 @@ Patch48: 0048-rootfs-block-block-genrules.sh-install-systemd-mount.patch
 Patch49: 0049-add-systemd-module.patch
 Patch50: 0050-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch
 Patch51: 0051-dracut.spec-add-98systemd-module.patch
-Patch52: 0062-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
+Patch52: 0052-Fail-to-boot-if-mediacheck-fails-817419.patch
+Patch53: 0053-Makefile-call-git2spec.pl-with-LANG-C.patch
+Patch54: 0054-ifcfg-write-ifcfg.sh-add-s390-specific-configuration.patch
+Patch55: 0055-systemd-adapt-to-new-switch-root-mechanism.patch
+Patch56: 0056-base-module-setup.sh-link-proc-self-mounts-to-initdi.patch
+Patch57: 0057-systemd-dracut-pre-pivot.sh-s-udevd.service-systemd-.patch
+Patch58: 0058-systemd-switch-root.target-run-target-before-switch-.patch
+Patch59: 0059-systemd-switch-root.service-do-not-require-shutdown-.patch
+Patch60: 0060-systemd-store-switch-root.conf-in-run-initramfs.patch
+Patch61: 0061-Makefile-install-dracut-service-files-from-systemd-d.patch
+Patch62: 0062-90kernel-modules-module-setup.sh-install-xhci-hcd.patch
+Patch63: 0063-check-kernel-module-existance.patch
+Patch64: 0064-check-install-files-passed-by-cmdline.patch
+Patch65: 0065-dracut-fstab-sys-Wait-for-devices-specified-using-mo.patch
+Patch66: 0066-TEST-01-BASIC-sync-after-creating-the-root-disk.patch
+Patch67: 0067-add-option-printsize.patch
+Patch68: 0068-check-ifenslave-instead-of-brctl-in-parse-bond.sh.patch
+Patch69: 0069-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
+Patch70: 0070-Use-the-right-argument-for-dasd-module-options.patch
+Patch71: 0071-Translate-dasd-arg-contents-into-proper-dasd.conf.patch
+Patch72: 0072-Normalize-dasd-argument-content-for-dasd.conf.patch
+Patch73: 0073-ifcfg-write-ifcfg.sh-fixed-IFS-resetting.patch
+
 
 BuildArch: noarch
 BuildRequires: dash bash git
@@ -353,6 +375,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sharedstatedir}/initramfs
 %if %{defined _unitdir}
 %{_unitdir}/*.service
+%{_unitdir}/*.target
 %{_unitdir}/*/*.service
 %endif
 
@@ -393,6 +416,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue May 22 2012 Harald Hoyer <harald@redhat.com> 018-74.git20120522
+- new upstream version
+
 * Thu May 17 2012 Dennis Gilmore <dennis@ausil.us> 018-53.git20120509
 - add patch to pull in arm storage modules