From 0c26bf1316fbd5856b4177894b9d2d335e27bac7 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: May 04 2012 11:03:29 +0000
Subject: dracut-018-40.git20120504


- 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 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-virtfs-root-filesystem-support.patch b/0013-virtfs-root-filesystem-support.patch
index cf2c680..9aff639 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 files changed, 112 insertions(+)
+ 4 Dateien geändert, 112 Zeilen hinzugefügt(+)
  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 d50981a..d03ae71 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 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 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 23cabe3..ba60195 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 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/0016-man-Fix-add-fstab-option-in-man-page.patch b/0016-man-Fix-add-fstab-option-in-man-page.patch
index b26d1ea..afcae89 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 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/0017-udevd-moved-to-lib-systemd-systemd-udevd.patch b/0017-udevd-moved-to-lib-systemd-systemd-udevd.patch
index 7b7558d..2c57adb 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 files changed, 11 insertions(+), 2 deletions(-)
+ 3 Dateien geändert, 11 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
 
 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 4f056f8..af83448 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 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 0ea72e8..65bc88f 100755
diff --git a/0019-99shutdown-shutdown.sh-export-PATH.patch b/0019-99shutdown-shutdown.sh-export-PATH.patch
index 4992a2b..05d88a0 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 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/0020-Makefile-do-not-install-systemd-service-in-reboot.patch b/0020-Makefile-do-not-install-systemd-service-in-reboot.patch
index e34ee4d..8dd1143 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 file changed, 3 deletions(-)
+ 1 Datei geändert, 3 Zeilen entfernt(-)
 
 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 563be43..9dd3cbb 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 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/0022-add-pre-pivot-cleanup-hook.patch b/0022-add-pre-pivot-cleanup-hook.patch
index b60a5de..078a65b 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 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/0023-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch b/0023-move-cleanup-scripts-to-pre-pivot-cleanup-hook.patch
index 8618ece..a300cc8 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 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/0024-network-parse-ip-opts.sh-remove-check-for-netroot.patch b/0024-network-parse-ip-opts.sh-remove-check-for-netroot.patch
index 9d39039..09680c8 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 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/0025-url-lib-don-t-add-existing-handlers-multiple-times.patch b/0025-url-lib-don-t-add-existing-handlers-multiple-times.patch
index 89d342c..a6113ba 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 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/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 70b8b29..4e18f7b 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 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/0027-base-add-debug_on-and-debug_off-functions.patch b/0027-base-add-debug_on-and-debug_off-functions.patch
index 8f767ef..69f712d 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 files changed, 31 insertions(+), 17 deletions(-)
+ 2 Dateien geändert, 31 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-)
 
 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 614b16f..02a5505 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 files changed, 17 insertions(+), 8 deletions(-)
+ 2 Dateien geändert, 17 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-)
 
 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 266428b..0379099 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 file changed, 7 insertions(+), 3 deletions(-)
+ 1 Datei geändert, 7 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
 
 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 102d7e1..10f7580 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 files changed, 13 insertions(+), 14 deletions(-)
+ 10 Dateien geändert, 13 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-)
 
 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 1a8c83d..000b243 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 files changed, 48 insertions(+), 86 deletions(-)
+ 5 Dateien geändert, 48 Zeilen hinzugefügt(+), 86 Zeilen entfernt(-)
 
 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 570eb60..3093ae4 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 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/0033-iscsi-module-setup.sh-fix-host-only-mount-checks.patch b/0033-iscsi-module-setup.sh-fix-host-only-mount-checks.patch
index 4f6deeb..d51c1a2 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 file changed, 6 insertions(+), 10 deletions(-)
+ 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 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 669cc3e..6b9f8b1 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 file changed, 7 insertions(+), 9 deletions(-)
+ 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 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 daed80f..ea3b46a 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 file changed, 8 insertions(+), 16 deletions(-)
+ 1 Datei geändert, 8 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-)
 
 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 6f53376..b20757e 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 files changed, 10 insertions(+), 4 deletions(-)
+ 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
diff --git a/0037-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch b/0037-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
new file mode 100644
index 0000000..db481e9
--- /dev/null
+++ b/0037-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
@@ -0,0 +1,29 @@
+From 982161e062e1696067cc19a990a31924b29c0df1 Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods@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 a6b8d1a..ddb6954 100755
+--- a/modules.d/99base/dracut-lib.sh
++++ b/modules.d/99base/dracut-lib.sh
+@@ -48,6 +48,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/0038-ifcfg-fix-resolv.conf.patch b/0038-ifcfg-fix-resolv.conf.patch
new file mode 100644
index 0000000..e966f10
--- /dev/null
+++ b/0038-ifcfg-fix-resolv.conf.patch
@@ -0,0 +1,23 @@
+From 335bb5a35b35d1bc81dc880fee67e247222c1f58 Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods@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/0039-TODO-update.patch b/0039-TODO-update.patch
new file mode 100644
index 0000000..e9569e1
--- /dev/null
+++ b/0039-TODO-update.patch
@@ -0,0 +1,22 @@
+From a54658c1580e8e80251b6f9d30475495710e146a Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 4 May 2012 11:32:48 +0200
+Subject: [PATCH] TODO: update
+
+---
+ TODO |    2 ++
+ 1 Datei geändert, 2 Zeilen hinzugefügt(+)
+
+diff --git a/TODO b/TODO
+index 6c27268..81121de 100644
+--- a/TODO
++++ b/TODO
+@@ -6,6 +6,8 @@ Items are ordered in priority.
+ 
+ INITRAMFS TODO
+ 
++- fix btrfs subvolume mounting for /usr (fsck)
++- generate systemd unit dracut-initramfs-restore in /run/systemd dynamically
+ - put "root=" parsing hooks in separate hook dir
+ - call "root=" parsing hooks after getting new rootpath from dhcp
+ - put mount hook in main initqueue loop
diff --git a/dracut.spec b/dracut.spec
index 97bcc92..32ed208 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 018
-Release: 37.git20120425%{?dist}.1
+Release: 40.git20120504%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -60,6 +60,9 @@ Patch33: 0033-iscsi-module-setup.sh-fix-host-only-mount-checks.patch
 Patch34: 0034-multipath-module-setup.sh-fix-host-only-mount-checks.patch
 Patch35: 0035-udev-rules-module-setup.sh-fixed-udevd-location.patch
 Patch36: 0036-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch
+Patch37: 0037-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
+Patch38: 0038-ifcfg-fix-resolv.conf.patch
+Patch39: 0039-TODO-update.patch
 
 
 BuildArch: noarch
@@ -376,6 +379,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri May 04 2012 Harald Hoyer <harald@redhat.com> 018-40.git20120504
+- new upstream version
+
 * Wed Apr 25 2012 Harald Hoyer <harald@redhat.com> 018-37.git20120425.1
 - fixup for multipath and iscsi host-only detection