diff --git a/0001-COPYING-updated-to-recent-version-of-http-www.gnu.or.patch b/0001-COPYING-updated-to-recent-version-of-http-www.gnu.or.patch
deleted file mode 100644
index e23a921..0000000
--- a/0001-COPYING-updated-to-recent-version-of-http-www.gnu.or.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From aa11b710ce86190fbff9afeafedcbce85c7e9a7f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 1 Aug 2012 15:53:25 +0200
-Subject: [PATCH] COPYING: updated to recent version of
- http://www.gnu.org/licenses/gpl-2.0.txt
-
----
- COPYING | 42 +++++++++++++++++++++---------------------
- 1 file changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/COPYING b/COPYING
-index a43ea21..d159169 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,12 @@
--		    GNU GENERAL PUBLIC LICENSE
--		       Version 2, June 1991
-+                    GNU GENERAL PUBLIC LICENSE
-+                       Version 2, June 1991
- 
-- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
--                          675 Mass Ave, Cambridge, MA 02139, USA
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  Everyone is permitted to copy and distribute verbatim copies
-  of this license document, but changing it is not allowed.
- 
--			    Preamble
-+                            Preamble
- 
-   The licenses for most software are designed to take away your
- freedom to share and change it.  By contrast, the GNU General Public
-@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
- General Public License applies to most of the Free Software
- Foundation's software and to any other program whose authors commit to
- using it.  (Some other Free Software Foundation software is covered by
--the GNU Library General Public License instead.)  You can apply it to
-+the GNU Lesser General Public License instead.)  You can apply it to
- your programs, too.
- 
-   When we speak of free software, we are referring to freedom, not
-@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
- 
-   The precise terms and conditions for copying, distribution and
- modification follow.
--
--		    GNU GENERAL PUBLIC LICENSE
-+
-+                    GNU GENERAL PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 
-   0. This License applies to any program or other work which contains
-@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
-     License.  (Exception: if the Program itself is interactive but
-     does not normally print such an announcement, your work based on
-     the Program is not required to print an announcement.)
--
-+
- These requirements apply to the modified work as a whole.  If
- identifiable sections of that work are not derived from the Program,
- and can be reasonably considered independent and separate works in
-@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
- access to copy the source code from the same place counts as
- distribution of the source code, even though third parties are not
- compelled to copy the source along with the object code.
--
-+
-   4. You may not copy, modify, sublicense, or distribute the Program
- except as expressly provided under this License.  Any attempt
- otherwise to copy, modify, sublicense or distribute the Program is
-@@ -225,7 +225,7 @@ impose that choice.
- 
- This section is intended to make thoroughly clear what is believed to
- be a consequence of the rest of this License.
--
-+
-   8. If the distribution and/or use of the Program is restricted in
- certain countries either by patents or by copyrighted interfaces, the
- original copyright holder who places the Program under this License
-@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
- of preserving the free status of all derivatives of our free software and
- of promoting the sharing and reuse of software generally.
- 
--			    NO WARRANTY
-+                            NO WARRANTY
- 
-   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
- FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
- PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGES.
- 
--		     END OF TERMS AND CONDITIONS
--
--	Appendix: How to Apply These Terms to Your New Programs
-+                     END OF TERMS AND CONDITIONS
-+
-+            How to Apply These Terms to Your New Programs
- 
-   If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
-@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
- the "copyright" line and a pointer to where the full notice is found.
- 
-     <one line to give the program's name and a brief idea of what it does.>
--    Copyright (C) 19yy  <name of author>
-+    Copyright (C) <year>  <name of author>
- 
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
- 
--    You should have received a copy of the GNU General Public License
--    along with this program; if not, write to the Free Software
--    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+    You should have received a copy of the GNU General Public License along
-+    with this program; if not, write to the Free Software Foundation, Inc.,
-+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
- Also add information on how to contact you by electronic and paper mail.
- 
- If the program is interactive, make it output a short notice like this
- when it starts in an interactive mode:
- 
--    Gnomovision version 69, Copyright (C) 19yy name of author
-+    Gnomovision version 69, Copyright (C) year name of author
-     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-     This is free software, and you are welcome to redistribute it
-     under certain conditions; type `show c' for details.
-@@ -335,5 +335,5 @@ necessary.  Here is a sample; alter the names:
- This General Public License does not permit incorporating your program into
- proprietary programs.  If your program is a subroutine library, you may
- consider it more useful to permit linking proprietary applications with the
--library.  If this is what you want to do, use the GNU Library General
-+library.  If this is what you want to do, use the GNU Lesser General
- Public License instead of this License.
diff --git a/0001-include-the-omap_hsmmc-module-on-arm.patch b/0001-include-the-omap_hsmmc-module-on-arm.patch
deleted file mode 100644
index 6503ac1..0000000
--- a/0001-include-the-omap_hsmmc-module-on-arm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e0c1a5dc6b23b905590e4ba8876bf0b56709833f Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis@ausil.us>
-Date: Thu, 2 Aug 2012 05:11:43 -0500
-Subject: [PATCH] include the omap_hsmmc module on arm
-
----
- 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 4e75ef8..e58b257 100755
---- a/modules.d/90kernel-modules/module-setup.sh
-+++ b/modules.d/90kernel-modules/module-setup.sh
-@@ -40,7 +40,7 @@ installkernel() {
-         hostonly='' instmods usb_storage sdhci sdhci-pci
- 
-         # arm specific modules
--        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap omapdrm sdhci_dove ahci_platform pata_imx sata_mv
-+        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap omapdrm omap_hsmmc 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 hid_generic
--- 
-1.7.11.2
-
diff --git a/0002-dracut.conf.d-gentoo.conf.example-fix-header.patch b/0002-dracut.conf.d-gentoo.conf.example-fix-header.patch
deleted file mode 100644
index 6beba7a..0000000
--- a/0002-dracut.conf.d-gentoo.conf.example-fix-header.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From a41dc8f96903b750259e19fe724cd808b7570765 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Wed, 1 Aug 2012 16:23:24 +0200
-Subject: [PATCH] dracut.conf.d/gentoo.conf.example: fix header
-
----
- dracut.conf.d/gentoo.conf.example | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 6b74954..7b94cf5 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,4 +1,4 @@
--# /etc/dracut.conf.d/gentoo-openrc.conf
-+# /etc/dracut.conf.d/gentoo.conf
- # Dracut config file customized for Gentoo Base System release 2
- 
- udevdir=/lib/udev
diff --git a/0003-dracut.conf.5.asc-s-dracut-conf.d-dracut.conf.d-g.patch b/0003-dracut.conf.5.asc-s-dracut-conf.d-dracut.conf.d-g.patch
deleted file mode 100644
index 8d32594..0000000
--- a/0003-dracut.conf.5.asc-s-dracut-conf.d-dracut.conf.d-g.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dece5ee1f530335d2c2c10472733f838f6027434 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 1 Aug 2012 16:35:46 +0200
-Subject: [PATCH] dracut.conf.5.asc: s#dracut/conf.d#dracut.conf.d#g
-
----
- dracut.conf.5.asc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
-index 89bbf61..f3a7de6 100644
---- a/dracut.conf.5.asc
-+++ b/dracut.conf.5.asc
-@@ -127,8 +127,8 @@ _/etc/dracut.conf_::
-     Old configuration file. You better use your own file in
-     _/etc/dracut/conf.d/_.
- 
--_/etc/dracut/conf.d/_::
--    Any _/etc/dracut/conf.d/*.conf_ file can overwrite the values in
-+_/etc/dracut.conf.d/_::
-+    Any _/etc/dracut.conf.d/*.conf_ file can overwrite the values in
-     _/etc/dracut.conf_. The configuration files are read in alphanumerical
-     order.
- 
diff --git a/0004-include-the-omap_hsmmc-module-on-arm.patch b/0004-include-the-omap_hsmmc-module-on-arm.patch
deleted file mode 100644
index 8687717..0000000
--- a/0004-include-the-omap_hsmmc-module-on-arm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ec6d8eab6963078bc472f7512cc1a1491dee98e6 Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis@ausil.us>
-Date: Thu, 2 Aug 2012 05:12:54 -0500
-Subject: [PATCH] include the omap_hsmmc module on arm
-
----
- 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 4e75ef8..e58b257 100755
---- a/modules.d/90kernel-modules/module-setup.sh
-+++ b/modules.d/90kernel-modules/module-setup.sh
-@@ -40,7 +40,7 @@ installkernel() {
-         hostonly='' instmods usb_storage sdhci sdhci-pci
- 
-         # arm specific modules
--        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap omapdrm sdhci_dove ahci_platform pata_imx sata_mv
-+        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap omapdrm omap_hsmmc 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 hid_generic
diff --git a/0005-mdraid-always-create-need_shutdown-if-we-have-assemb.patch b/0005-mdraid-always-create-need_shutdown-if-we-have-assemb.patch
deleted file mode 100644
index 3a487a9..0000000
--- a/0005-mdraid-always-create-need_shutdown-if-we-have-assemb.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From e4297a66b1458329437e35bf7d99a4f20c1d824d Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 14 Aug 2012 17:44:46 +0200
-Subject: [PATCH] mdraid: always create need_shutdown, if we have assembled a
- raid
-
----
- modules.d/90mdraid/mdraid-cleanup.sh      |  4 ++--
- modules.d/90mdraid/mdraid-needshutdown.sh | 11 +++++++++++
- modules.d/90mdraid/module-setup.sh        |  1 +
- 3 files changed, 14 insertions(+), 2 deletions(-)
- create mode 100755 modules.d/90mdraid/mdraid-needshutdown.sh
-
-diff --git a/modules.d/90mdraid/mdraid-cleanup.sh b/modules.d/90mdraid/mdraid-cleanup.sh
-index 9c4bc18..da86d65 100755
---- a/modules.d/90mdraid/mdraid-cleanup.sh
-+++ b/modules.d/90mdraid/mdraid-cleanup.sh
-@@ -14,11 +14,11 @@ for md in /dev/md[0-9_]*; do
-         containers="$containers $md"
-         continue
-     fi
--    mdadm $_offroot -S "$md" >/dev/null 2>&1 || need_shutdown
-+    mdadm $_offroot -S "$md" >/dev/null 2>&1
- done
- 
- for md in $containers; do
--    mdadm $_offroot -S "$md" >/dev/null 2>&1 || need_shutdown
-+    mdadm $_offroot -S "$md" >/dev/null 2>&1
- done
- 
- unset containers udevinfo _offroot
-diff --git a/modules.d/90mdraid/mdraid-needshutdown.sh b/modules.d/90mdraid/mdraid-needshutdown.sh
-new file mode 100755
-index 0000000..79f9852
---- /dev/null
-+++ b/modules.d/90mdraid/mdraid-needshutdown.sh
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-+# ex: ts=8 sw=4 sts=4 et filetype=sh
-+
-+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-+
-+for md in /dev/md[0-9_]*; do
-+    [ -b "$md" ] || continue
-+    need_shutdown
-+    break
-+done
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 8522756..6119226 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -84,6 +84,7 @@ install() {
-     inst_hook pre-udev 30 "$moddir/mdmon-pre-udev.sh"
-     inst_hook pre-trigger 30 "$moddir/parse-md.sh"
-     inst_hook pre-mount 10 "$moddir/mdraid-waitclean.sh"
-+    inst_hook cleanup 99 "$moddir/mdraid-needshutdown.sh"
-     inst_hook shutdown 30 "$moddir/md-shutdown.sh"
-     inst_script "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
-     inst_script "$moddir/mdraid_start.sh" /sbin/mdraid_start
diff --git a/0006-add-back-scsi_wait_scan.patch b/0006-add-back-scsi_wait_scan.patch
deleted file mode 100644
index 7f7dfb2..0000000
--- a/0006-add-back-scsi_wait_scan.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bdf1f472b461747d4cb9f32ae18bb2033e592970 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 17 Aug 2012 09:22:12 +0200
-Subject: [PATCH] add back scsi_wait_scan
-
----
- modules.d/98systemd/dracut-initqueue.sh | 1 +
- modules.d/99base/init.sh                | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
-index e9da432..773e4cd 100755
---- a/modules.d/98systemd/dracut-initqueue.sh
-+++ b/modules.d/98systemd/dracut-initqueue.sh
-@@ -25,6 +25,7 @@ while :; do
-     check_finished && break
- 
-     udevsettle
-+    modprobe -q scsi_wait_scan && modprobe -q -r scsi_wait_scan
- 
-     check_finished && break
- 
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 16c8958..4c5a2f8 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -156,6 +156,7 @@ while :; do
-     check_finished && break
- 
-     udevsettle
-+    modprobe -q scsi_wait_scan && modprobe -q -r scsi_wait_scan
- 
-     check_finished && break
- 
diff --git a/0007-network-reintroduce-rd.neednet.patch b/0007-network-reintroduce-rd.neednet.patch
deleted file mode 100644
index 83642bf..0000000
--- a/0007-network-reintroduce-rd.neednet.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 48dba7f9ace186871528eb4d83cd96e92e853c6c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 21 Aug 2012 14:47:14 +0200
-Subject: [PATCH] network: reintroduce rd.neednet
-
-rd.neednet is used by anaconda and the network interfaces cannot
-be known in advance.
----
- dracut.cmdline.7.asc                | 3 +++
- modules.d/40network/net-genrules.sh | 4 +++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
-index 71d02ca..c376d79 100644
---- a/dracut.cmdline.7.asc
-+++ b/dracut.cmdline.7.asc
-@@ -384,6 +384,9 @@ interface name. Better name it "bootnet" or "bluesocket".
- **biosdevname=0**::
-     boolean, turn off biosdevname network interface renaming
- 
-+**rd.neednet=1**::
-+    boolean, bring up network even without netroot set
-+
- **vlan=_<vlanname>_:_<phydevice>_**::
-     Setup vlan device named <vlanname> on <phydeivce>.
-     We support the four styles of vlan names: VLAN_PLUS_VID (vlan0005), VLAN_PLUS_VID_NO_PAD (vlan5),
-diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
-index 8aeee2d..6a58ab5 100755
---- a/modules.d/40network/net-genrules.sh
-+++ b/modules.d/40network/net-genrules.sh
-@@ -15,7 +15,9 @@ fix_bootif() {
- }
- 
- # Don't continue if we don't need network
--[ -z "$netroot" ] && ! [ -e "/tmp/net.ifaces" ] && return;
-+if [ -z "$netroot" ] && [ ! -e "/tmp/net.ifaces" ] && ! getargbool 0 rd.neednet >/dev/null; then
-+    return
-+fi
- 
- # Write udev rules
- {
diff --git a/0008-fips-set-boot-as-symlink-to-sysroot-boot-if-no-boot-.patch b/0008-fips-set-boot-as-symlink-to-sysroot-boot-if-no-boot-.patch
deleted file mode 100644
index 91a7f93..0000000
--- a/0008-fips-set-boot-as-symlink-to-sysroot-boot-if-no-boot-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c9a9968dfc7f8fb644909cbb52e27fe7312156a7 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 21 Aug 2012 15:01:08 +0200
-Subject: [PATCH] fips: set /boot as symlink to /sysroot/boot if no boot=
- parameter
-
-otherwise sha512hmac will error out with:
-
-sha512hmac -c /sysroot/boot/.vmlinuz-2.6.32-220.el6.x86_64.hmac
-Error opening "/boot/vmlinuz-2.6.32-220.el6.x86_64": No such file or directory.
----
- modules.d/01fips/fips.sh | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
-index 67eefb8..324e062 100755
---- a/modules.d/01fips/fips.sh
-+++ b/modules.d/01fips/fips.sh
-@@ -45,23 +45,23 @@ mount_boot()
-         mkdir /boot
-         info "Mounting $boot as /boot"
-         mount -oro "$boot" /boot || return 1
-+    elif [ -d "$NEWROOT/boot" ]; then
-+        rm -fr /boot
-+        ln -sf "$NEWROOT/boot" /boot
-     fi
- }
- 
- do_fips()
- {
-     info "Checking integrity of kernel"
--    newroot=$NEWROOT
-     KERNEL=$(uname -r)
- 
--    [ -e "$newroot/boot/.vmlinuz-${KERNEL}.hmac" ] || unset newroot
--
--    if ! [ -e "$newroot/boot/.vmlinuz-${KERNEL}.hmac" ]; then
--        warn "$newroot/boot/.vmlinuz-${KERNEL}.hmac does not exist"
-+    if ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then
-+        warn "/boot/.vmlinuz-${KERNEL}.hmac does not exist"
-         return 1
-     fi
- 
--    sha512hmac -c "$newroot/boot/.vmlinuz-${KERNEL}.hmac" || return 1
-+    sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1
- 
-     FIPSMODULES=$(cat /etc/fipsmodules)
- 
diff --git a/0009-install-dracut-install.c-Ensure-deps-are-resolved-wh.patch b/0009-install-dracut-install.c-Ensure-deps-are-resolved-wh.patch
deleted file mode 100644
index ab4124a..0000000
--- a/0009-install-dracut-install.c-Ensure-deps-are-resolved-wh.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 68318328f1fc394ac043b939425715ba78dc6f57 Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <colin@mageia.org>
-Date: Tue, 14 Aug 2012 22:09:39 +0100
-Subject: [PATCH] install/dracut-install.c: Ensure deps are resolved when
- handling scripts
-
-If we are doing lazy dep solving and happen to process a script with a
-shebang on e.g. /bin/bash before we encounter the actual binary itself
-we effectively ignore the fact that we've been asked to resolve the deps
-and put the item in the 'seen' hashmap. Thus when we later really do try
-and resolve deps, we short circuit and don't do anything.
-
-Example test case:
-
-$ cd
-$ mkdir -p foo/bin
-$ cp /bin/bash foo/bin
-$ echo '#!/bin/bash' >foo/bin/script
-$ dracut-install -D $HOME/foo -R $HOME/foo/bin/script $HOME/foo/bin/bash
----
- install/dracut-install.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index e79065d..9a244ba 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -392,10 +392,15 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
-         }
- 
-         if (ret == 0) {
--                log_debug("'%s' already exists", fulldstpath);
-+                if (resolvedeps) {
-+                        log_debug("'%s' already exists, but checking for any deps", fulldstpath);
-+                        ret = resolve_deps(src);
-+                } else
-+                        log_debug("'%s' already exists", fulldstpath);
-+
-                 free(fulldstpath);
-                 /* dst does already exist */
--                return 0;
-+                return ret;
-         }
- 
-         /* check destination directory */
diff --git a/0010-install-dracut-install.c-Deal-gracefully-with-paths-.patch b/0010-install-dracut-install.c-Deal-gracefully-with-paths-.patch
deleted file mode 100644
index 6821a82..0000000
--- a/0010-install-dracut-install.c-Deal-gracefully-with-paths-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f9c7788ba5bbb9785ba9946c7a6500fc0c782244 Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <colin@mageia.org>
-Date: Tue, 14 Aug 2012 22:32:00 +0100
-Subject: [PATCH] install/dracut-install.c: Deal gracefully with paths
- containing double /'s
-
-While such paths should not be included internally, we cannot
-guarantee that external scripts with shebangs will not do this.
-
-Some older versions of plymouth also resulted in double /'s
-in some paths, so best deal with this gracefully.
----
- install/dracut-install.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 9a244ba..dfee259 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -64,7 +64,7 @@ static size_t dir_len(char const *file)
-         size_t length;
-         /* Strip the basename and any redundant slashes before it.  */
-         for (length = strlen(file); 0 < length; length--)
--                if (file[length] == '/')
-+                if (file[length] == '/' && file[length-1] != '/')
-                         break;
-         return length;
- }
-@@ -91,7 +91,13 @@ static char *convert_abs_rel(const char *from, const char *target)
-                 return strdup(from);
-         }
- 
--        asprintf(&realtarget, "%s/%s", q, &p[dirlen + 1]);
-+        /* dir_len() skips double /'s e.g. //lib64, so we can't skip just one
-+         * character - need to skip all leading /'s */
-+        rl = strlen(target);
-+        for (i = dirlen+1; i < rl; ++i)
-+            if (p[i] != '/')
-+                break;
-+        asprintf(&realtarget, "%s/%s", q, &p[i]);
-         free(p);
-         free(q);
- 
diff --git a/0011-install-dracut-install.c-No-need-to-compare-the-NULL.patch b/0011-install-dracut-install.c-No-need-to-compare-the-NULL.patch
deleted file mode 100644
index 001bc71..0000000
--- a/0011-install-dracut-install.c-No-need-to-compare-the-NULL.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 68c49db95233d03a25b27e01709cd052d60cef7a Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <colin@mageia.org>
-Date: Sat, 18 Aug 2012 11:38:02 +0100
-Subject: [PATCH] install/dracut-install.c: No need to compare the NULL byte
- each time.
-
----
- install/dracut-install.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index dfee259..c95b7c2 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -63,7 +63,7 @@ static size_t dir_len(char const *file)
- {
-         size_t length;
-         /* Strip the basename and any redundant slashes before it.  */
--        for (length = strlen(file); 0 < length; length--)
-+        for (length = strlen(file)-1; 0 < length; length--)
-                 if (file[length] == '/' && file[length-1] != '/')
-                         break;
-         return length;
diff --git a/0012-udev-rules-Pre-usrmove-systemd-installs-might-not-fi.patch b/0012-udev-rules-Pre-usrmove-systemd-installs-might-not-fi.patch
deleted file mode 100644
index 7967217..0000000
--- a/0012-udev-rules-Pre-usrmove-systemd-installs-might-not-fi.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f9452c94c05e505d358329fbb228da7979770c4c Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <colin@mageia.org>
-Date: Thu, 16 Aug 2012 14:27:22 +0100
-Subject: [PATCH] udev-rules: Pre usrmove systemd installs might not find
- udevd.
-
-If users had switched to systemd-183+ but have not completed
-the usrmove, then the variable ${systemdutildir} will likely
-refer to /usr/lib/systemd NOT /lib/systemd and thus the
-systemd-udevd daemon may not be found.
-
-So let's try a little harder and add another hard coded path
-and if we don't find it, then bail out hard.
----
- modules.d/95udev-rules/module-setup.sh | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
-index 2e3c955..5e1cce5 100755
---- a/modules.d/95udev-rules/module-setup.sh
-+++ b/modules.d/95udev-rules/module-setup.sh
-@@ -12,7 +12,7 @@ install() {
-         /etc/udev/udev.conf /etc/group
- 
-     [ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd
--    for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
-+    for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /lib/systemd/systemd-udevd /sbin/udevd; do
-         [ -x "$_i" ] || continue
-         inst "$_i"
- 
-@@ -21,6 +21,10 @@ install() {
-         fi
-         break
-     done
-+    if ! [[ -e ${initdir}/lib/systemd/systemd-udevd ]]; then
-+        derror "Cannot find [systemd-]udevd binary!"
-+        exit 1
-+    fi
- 
-     inst_rules 50-udev-default.rules 60-persistent-storage.rules \
-         61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \
diff --git a/0013-mdraid-catch-nested-md-raids.patch b/0013-mdraid-catch-nested-md-raids.patch
deleted file mode 100644
index 864c9ec..0000000
--- a/0013-mdraid-catch-nested-md-raids.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5746f04994745ac4ad01b4ae26f6c368ac725fb3 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 22 Aug 2012 13:01:53 +0200
-Subject: [PATCH] mdraid: catch nested md raids
-
-Thanks to Ian Dall!
----
- modules.d/90mdraid/65-md-incremental-imsm.rules | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
-index 6dd696a..d66dd01 100644
---- a/modules.d/90mdraid/65-md-incremental-imsm.rules
-+++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
-@@ -5,7 +5,9 @@
- ACTION!="add|change", GOTO="md_end"
- SUBSYSTEM!="block", GOTO="md_end"
- ENV{rd_NO_MD}=="?*", GOTO="md_end"
--KERNEL=="md*", GOTO="md_end"
-+KERNEL=="md*", ENV{ID_FS_TYPE}!="linux_raid_member", GOTO="md_end"
-+KERNEL=="md*", ACTION!="change", GOTO="md_end"
-+
- # Also don't process disks that are slated to be a multipath device
- ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end"
- 
diff --git a/0014-znet-add-some-more-kernel-drivers.patch b/0014-znet-add-some-more-kernel-drivers.patch
deleted file mode 100644
index 25069f7..0000000
--- a/0014-znet-add-some-more-kernel-drivers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c1b8934faaaa9a4be4831418abc0893e10f61faa Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 22 Aug 2012 13:16:23 +0200
-Subject: [PATCH] znet: add some more kernel drivers
-
----
- modules.d/95znet/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/95znet/module-setup.sh b/modules.d/95znet/module-setup.sh
-index b2ffa10..406d139 100755
---- a/modules.d/95znet/module-setup.sh
-+++ b/modules.d/95znet/module-setup.sh
-@@ -14,7 +14,7 @@ depends() {
- }
- 
- installkernel() {
--    instmods ctcm
-+    instmods ctcm lcs qeth qeth_l2 qeth_l3
- }
- 
- install() {
diff --git a/0015-network-add-ping-and-ping6.patch b/0015-network-add-ping-and-ping6.patch
deleted file mode 100644
index 48e9401..0000000
--- a/0015-network-add-ping-and-ping6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 54c7ace14548a31103052e96cc097ae601f2ef4b Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 22 Aug 2012 17:27:26 +0200
-Subject: [PATCH] network: add ping and ping6
-
-better for a quick debug
----
- modules.d/40network/module-setup.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 0ffdd07..0546ba0 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -79,6 +79,7 @@ installkernel() {
- install() {
-     local _arch _i _dir
-     dracut_install ip arping dhclient sed
-+    dracut_install -o ping ping6
-     dracut_install -o brctl
-     inst_script "$moddir/ifup.sh" "/sbin/ifup"
-     inst_script "$moddir/netroot.sh" "/sbin/netroot"
diff --git a/0016-wait-host-devs-in-base-module.patch b/0016-wait-host-devs-in-base-module.patch
deleted file mode 100644
index 3f66bf4..0000000
--- a/0016-wait-host-devs-in-base-module.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From c4bb88715c14c7696257f38447ef1fb0e69f9874 Mon Sep 17 00:00:00 2001
-From: "dyoung@redhat.com" <dyoung@redhat.com>
-Date: Thu, 23 Aug 2012 11:02:22 +0800
-Subject: [PATCH] wait host devs in base module
-
-each dev in host_devs[] should be waited in initqueue to make sure they
-are oneline before initqueue finish.
-
-Add a new wait_host_devs.sh in base module to make this a generic thing.
-Because all the devs in fstab lines are also added to host_devs, so no need
-do same wait in fstab-sys module anymore.
-
-[v2->v3]: do not add slave devices to host_devs
-          wait for persistent dev name in initramfs
-
-Signed-off-by: Dave Young <dyoung@redhat.com>
----
- dracut.sh                               | 16 ++++++++++++++++
- modules.d/95fstab-sys/module-setup.sh   |  1 -
- modules.d/95fstab-sys/wait-mount-dev.sh | 22 ----------------------
- modules.d/99base/module-setup.sh        |  1 +
- modules.d/99base/wait-host-devs.sh      | 20 ++++++++++++++++++++
- 5 files changed, 37 insertions(+), 23 deletions(-)
- delete mode 100644 modules.d/95fstab-sys/wait-mount-dev.sh
- create mode 100644 modules.d/99base/wait-host-devs.sh
-
-diff --git a/dracut.sh b/dracut.sh
-index dc2c300..2b0b085 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -903,6 +903,22 @@ done
- 
- dinfo "*** Including modules done ***"
- 
-+get_persistent_dev() {
-+    local i _tmp
-+    local _dev=${1##*/}
-+
-+    for i in /dev/disk/by-id/*; do
-+        _tmp=$(readlink $i)
-+        [ "${_tmp##*/}" = "$_dev" ] && echo $i && return
-+    done
-+}
-+
-+## save host_devs which we need bring up
-+for _dev in ${host_devs[@]}; do
-+    _pdev=$(get_persistent_dev $_dev)
-+    [ -n "$_pdev" ] && echo $_pdev >> $initdir/etc/host_devs
-+done
-+
- ## final stuff that has to happen
- if [[ $no_kernel != yes ]]; then
- 
-diff --git a/modules.d/95fstab-sys/module-setup.sh b/modules.d/95fstab-sys/module-setup.sh
-index 8468448..ca66005 100755
---- a/modules.d/95fstab-sys/module-setup.sh
-+++ b/modules.d/95fstab-sys/module-setup.sh
-@@ -13,5 +13,4 @@ depends() {
- install() {
-     [ -f /etc/fstab.sys ] && inst_simple /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
-deleted file mode 100644
-index 99fc16c..0000000
---- a/modules.d/95fstab-sys/wait-mount-dev.sh
-+++ /dev/null
-@@ -1,22 +0,0 @@
--#!/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/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index 22ab277..196f6cf 100755
---- a/modules.d/99base/module-setup.sh
-+++ b/modules.d/99base/module-setup.sh
-@@ -41,6 +41,7 @@ install() {
-     dracut_install switch_root || dfatal "Failed to install switch_root"
- 
-     inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
-+    inst_hook cmdline 00 "$moddir/wait-host-devs.sh"
-     inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
-     mkdir -p "${initdir}/var"
-     [ -x /lib/systemd/systemd-timestamp ] && inst /lib/systemd/systemd-timestamp
-diff --git a/modules.d/99base/wait-host-devs.sh b/modules.d/99base/wait-host-devs.sh
-new file mode 100644
-index 0000000..ce84922
---- /dev/null
-+++ b/modules.d/99base/wait-host-devs.sh
-@@ -0,0 +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
-+
-+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-+
-+wait_host_devs() {
-+    local _dev
-+
-+    while read _dev; do
-+        case "$_dev" in
-+        /dev/?*)
-+            wait_for_dev $_dev
-+            ;;
-+        *) ;;
-+        esac
-+    done < $1
-+}
-+
-+[ -f /etc/host_devs ] && wait_host_devs /etc/host_devs
diff --git a/0017-Add-for_each_host_dev_and_slaves-for-device-only-che.patch b/0017-Add-for_each_host_dev_and_slaves-for-device-only-che.patch
deleted file mode 100644
index 2066d08..0000000
--- a/0017-Add-for_each_host_dev_and_slaves-for-device-only-che.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 83e0dc7a3dca16d2267f3b62192a82b80ba7d11f Mon Sep 17 00:00:00 2001
-From: "dyoung@redhat.com" <dyoung@redhat.com>
-Date: Thu, 23 Aug 2012 11:02:23 +0800
-Subject: [PATCH] Add for_each_host_dev_and_slaves for device only checking
-
-For lvm, multipath, iscsi modules they do not care about the filesystem,
-Also there could be devcie in host_devs but it does not get formated.
-
-For these kind of modules, use for_each_host_dev_and_slaves will be better than use
-for_each_host_dev_fs, here add a new function to iterate the host_devs and
-their slave devices.
-
-In original for_each_host_dev_fs, it will call check_block_and_slaves which
-will return once helper function return 0, but this is not enough for kdump
-iscsi setup. For kdump iscsi case, it need setup each slave devices so that
-the iscsi target can be properly setuped in initramfs.
-
-Thus, this patch also add new functions check_block_and_slaves_all and
-for_each_host_dev_and_slaves_all.
-
-Signed-off-by: Dave Young <dyoung@redhat.com>
-Tested-by: WANG Chao <chaowang@redhat.com>
----
- dracut-functions.sh                   | 48 ++++++++++++++++++++++++++++++++++-
- modules.d/90lvm/module-setup.sh       |  4 +--
- modules.d/90multipath/module-setup.sh |  5 ++--
- modules.d/95iscsi/module-setup.sh     |  5 ++--
- 4 files changed, 53 insertions(+), 9 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 2ad8f4a..f2832c8 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -383,7 +383,6 @@ find_mp_fstype() {
-     return 1
- }
- 
--
- # finds the major:minor of the block device backing the root filesystem.
- find_root_block_device() { find_block_device /; }
- 
-@@ -429,6 +428,53 @@ check_block_and_slaves() {
-     return 1
- }
- 
-+check_block_and_slaves_all() {
-+    local _x _ret=1
-+    [[ -b /dev/block/$2 ]] || return 1 # Not a block device? So sorry.
-+    if "$1" $2; then
-+          _ret=0
-+    fi
-+    check_vol_slaves "$@" && return 0
-+    if [[ -f /sys/dev/block/$2/../dev ]]; then
-+        check_block_and_slaves_all $1 $(cat "/sys/dev/block/$2/../dev") && _ret=0
-+    fi
-+    [[ -d /sys/dev/block/$2/slaves ]] || return 1
-+    for _x in /sys/dev/block/$2/slaves/*/dev; do
-+        [[ -f $_x ]] || continue
-+        check_block_and_slaves_all $1 $(cat "$_x") && _ret=0
-+    done
-+    return $_ret
-+}
-+# for_each_host_dev_and_slaves <func>
-+# Execute "<func> <dev>" for every "<dev>" found
-+# in ${host_devs[@]} and their slaves
-+for_each_host_dev_and_slaves_all()
-+{
-+    local _func="$1"
-+    local _dev
-+    local _ret=1
-+    for _dev in ${host_devs[@]}; do
-+        [[ -b "$_dev" ]] || continue
-+        echo host_devs: $_dev
-+        if check_block_and_slaves_all $_func $(get_maj_min $_dev); then
-+               _ret=0
-+        fi
-+    done
-+    return $_ret
-+}
-+
-+for_each_host_dev_and_slaves()
-+{
-+    local _func="$1"
-+    local _dev
-+    for _dev in ${host_devs[@]}; do
-+        [[ -b "$_dev" ]] || continue
-+        echo host_devs: $_dev
-+        check_block_and_slaves_all $_func $(get_maj_min $_dev) && return 0
-+    done
-+    return 1
-+}
-+
- # ugly workaround for the lvm design
- # There is no volume group device,
- # so, there are no slave devices for volume groups.
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index 49ea114..cefd3e9 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -9,7 +9,7 @@ check() {
- 
-     check_lvm() {
-         local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
--        eval $(udevadm info --query=property --name=$1|egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
-+        eval $(udevadm info --query=property --name=/dev/block/$1|egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
-         [[ "$DM_UDEV_DISABLE_DISK_RULES_FLAG" = "1" ]] && return 1
-         [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
-         if ! strstr " ${_activated[*]} " " ${DM_VG_NAME}/${DM_LV_NAME} "; then
-@@ -22,7 +22,7 @@ check() {
-     }
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_fs check_lvm || return 1
-+        for_each_host_dev_and_slaves check_lvm || return 1
-     }
- 
-     return 0
-diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
-index 31d1108..d2d2b3b 100755
---- a/modules.d/90multipath/module-setup.sh
-+++ b/modules.d/90multipath/module-setup.sh
-@@ -8,15 +8,14 @@ check() {
-     type -P multipath >/dev/null || return 1
- 
-     is_mpath() {
--        local _dev
--        _dev=$(get_maj_min $1)
-+        local _dev=$1
-         [ -e /sys/dev/block/$_dev/dm/uuid ] || return 1
-         [[ $(cat /sys/dev/block/$_dev/dm/uuid) =~ mpath- ]] && return 0
-         return 1
-     }
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_fs is_mpath || return 1
-+        for_each_host_dev_and_slaves is_mpath || return 1
-     }
- 
-     return 0
-diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
-index a67dfa4..d251a0d 100755
---- a/modules.d/95iscsi/module-setup.sh
-+++ b/modules.d/95iscsi/module-setup.sh
-@@ -11,8 +11,7 @@ check() {
-     # booting from root.
- 
-     is_iscsi() (
--        local _dev
--        _dev=$(get_maj_min $1)
-+        local _dev=$1
- 
-         [[ -L /sys/dev/block/$_dev ]] || return
-         cd "$(readlink -f /sys/dev/block/$_dev)"
-@@ -23,7 +22,7 @@ check() {
-     )
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_fs is_iscsi || return 1
-+        for_each_host_dev_and_slaves is_iscsi || return 1
-     }
-     return 0
- }
diff --git a/0018-Add-a-dracut-option-device-to-bring-up-a-device-in-i.patch b/0018-Add-a-dracut-option-device-to-bring-up-a-device-in-i.patch
deleted file mode 100644
index 8ce3230..0000000
--- a/0018-Add-a-dracut-option-device-to-bring-up-a-device-in-i.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 52f1b04183a6a1e0cfbb7e5b46c8d371fdadea5b Mon Sep 17 00:00:00 2001
-From: "dyoung@redhat.com" <dyoung@redhat.com>
-Date: Thu, 23 Aug 2012 11:02:24 +0800
-Subject: [PATCH] Add a dracut option --device to bring up a device in
- initramfs
-
-Kdump support dump to raw device which could be on top of complex storage
-such as multipath and iscsi which are standalone dracut modules.
-
-Add a --device option to dracut which will add the device to host_devs so
-dracut can add the dependent modules automaticlly and enable them in initramfs.
-
---device will accept device node name as the param.
-
-Signed-off-by: Dave Young <dyoung@redhat.com>
-Tested-by: Chao Wang <chaowang@redhat.com>
----
- dracut.8.asc | 3 +++
- dracut.sh    | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/dracut.8.asc b/dracut.8.asc
-index 0902b3b..203f9cd 100644
---- a/dracut.8.asc
-+++ b/dracut.8.asc
-@@ -321,6 +321,9 @@ provide a valid _/etc/fstab_.
-     Mount _<device>_ on _<mountpoint>_ with _<filesystem type>_ and _<filesystem
-     options>_ in the initramfs
- 
-+**--device** _<device>_ ::
-+    Bring up _<device>_ in initramfs, _<device>_ should be the device name
-+
- **-i, --include** _<SOURCE>_ _<TARGET>_::
-     include the files in the SOURCE directory into the
-     TARGET directory in the final initramfs. If SOURCE is a file, it will be
-diff --git a/dracut.sh b/dracut.sh
-index 2b0b085..a6f6193 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -133,6 +133,7 @@ Creates initial ramdisk images for preloading modules
-   --mount "[DEV] [MP] [FSTYPE] [FSOPTS]"
-                         Mount device [DEV] on mountpoint [MP] with filesystem
-                         [FSTYPE] and options [FSOPTS] in the initramfs
-+  --device "[DEV]"      Bring up [DEV] in initramfs
-   -i, --include [SOURCE] [TARGET]
-                         Include the files in the SOURCE directory into the
-                          Target directory in the final initramfs.
-@@ -261,6 +262,7 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \
-     --long fscks: \
-     --long add-fstab: \
-     --long mount: \
-+    --long device: \
-     --long nofscks: \
-     --long ro-mnt \
-     --long kmoddir: \
-@@ -327,6 +329,7 @@ while :; do
-         --fscks)       push fscks_l              "$2"; shift;;
-         --add-fstab)   push add_fstab_l          "$2"; shift;;
-         --mount)       push fstab_lines          "$2"; shift;;
-+        --device)      push host_devs            "$2"; shift;;
-         --nofscks)     nofscks_l="yes";;
-         --ro-mnt)      ro_mnt_l="yes";;
-         -k|--kmoddir)  drivers_dir_l="$2"; shift;;
diff --git a/0019-moved-the-etc-host_devs-write-out-to-99base.patch b/0019-moved-the-etc-host_devs-write-out-to-99base.patch
deleted file mode 100644
index 723c88e..0000000
--- a/0019-moved-the-etc-host_devs-write-out-to-99base.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 73088e46f72af142f810460aac4509579c80a673 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 23 Aug 2012 12:13:02 +0200
-Subject: [PATCH] moved the /etc/host_devs write out to 99base
-
-also removed some left-over debugging code
----
- dracut-functions.sh              |  2 --
- dracut.sh                        | 16 ----------------
- modules.d/99base/module-setup.sh | 20 ++++++++++++++++++++
- 3 files changed, 20 insertions(+), 18 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index f2832c8..c328f9f 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -455,7 +455,6 @@ for_each_host_dev_and_slaves_all()
-     local _ret=1
-     for _dev in ${host_devs[@]}; do
-         [[ -b "$_dev" ]] || continue
--        echo host_devs: $_dev
-         if check_block_and_slaves_all $_func $(get_maj_min $_dev); then
-                _ret=0
-         fi
-@@ -469,7 +468,6 @@ for_each_host_dev_and_slaves()
-     local _dev
-     for _dev in ${host_devs[@]}; do
-         [[ -b "$_dev" ]] || continue
--        echo host_devs: $_dev
-         check_block_and_slaves_all $_func $(get_maj_min $_dev) && return 0
-     done
-     return 1
-diff --git a/dracut.sh b/dracut.sh
-index a6f6193..7148d0f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -906,22 +906,6 @@ done
- 
- dinfo "*** Including modules done ***"
- 
--get_persistent_dev() {
--    local i _tmp
--    local _dev=${1##*/}
--
--    for i in /dev/disk/by-id/*; do
--        _tmp=$(readlink $i)
--        [ "${_tmp##*/}" = "$_dev" ] && echo $i && return
--    done
--}
--
--## save host_devs which we need bring up
--for _dev in ${host_devs[@]}; do
--    _pdev=$(get_persistent_dev $_dev)
--    [ -n "$_pdev" ] && echo $_pdev >> $initdir/etc/host_devs
--done
--
- ## final stuff that has to happen
- if [[ $no_kernel != yes ]]; then
- 
-diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index 196f6cf..8a18100 100755
---- a/modules.d/99base/module-setup.sh
-+++ b/modules.d/99base/module-setup.sh
-@@ -11,6 +11,19 @@ depends() {
-     return 0
- }
- 
-+get_persistent_dev() {
-+    local i _tmp
-+    local _dev=${1##*/}
-+
-+    for i in /dev/disk/by-id/*; do
-+        _tmp=$(readlink $i)
-+        if [ "$i" = "$_dev" ]; then
-+            echo $i
-+            return
-+        fi
-+    done
-+}
-+
- install() {
-     local _d
-     dracut_install mount mknod mkdir pidof sleep chroot \
-@@ -41,7 +54,14 @@ install() {
-     dracut_install switch_root || dfatal "Failed to install switch_root"
- 
-     inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
-+
-+    ## save host_devs which we need bring up
-     inst_hook cmdline 00 "$moddir/wait-host-devs.sh"
-+    for _dev in ${host_devs[@]}; do
-+        _pdev=$(get_persistent_dev $_dev)
-+        [ -n "$_pdev" ] && echo $_pdev >> $initdir/etc/host_devs
-+    done
-+
-     inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
-     mkdir -p "${initdir}/var"
-     [ -x /lib/systemd/systemd-timestamp ] && inst /lib/systemd/systemd-timestamp
diff --git a/0020-install-dracut-install.c-correct-usage-for-hmac.patch b/0020-install-dracut-install.c-correct-usage-for-hmac.patch
deleted file mode 100644
index 37cd329..0000000
--- a/0020-install-dracut-install.c-correct-usage-for-hmac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 353e7a7ec33baed5a3dff0f66198d73da419b07c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 23 Aug 2012 15:02:37 +0200
-Subject: [PATCH] install/dracut-install.c: correct usage() for hmac
-
----
- install/dracut-install.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index c95b7c2..0571c2a 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -521,7 +521,7 @@ Install SOURCE to DEST in DESTROOTDIR with all needed dependencies.\n\
-   -d --dir            SOURCE is a directory\n\
-   -l --ldd            Also install shebang executables and libraries\n\
-   -R --resolvelazy    Only install shebang executables and libraries for all SOURCE files\n\
--  -f --fips           Also install all '.SOURCE.hmac' files\n\
-+  -H --fips           Also install all '.SOURCE.hmac' files\n\
-   -v --verbose        Show more output\n\
-      --debug          Show debug output\n\
-      --version        Show package version\n\
diff --git a/0021-dracut-install-FIPS-workaround-for-fipscheck-dir.patch b/0021-dracut-install-FIPS-workaround-for-fipscheck-dir.patch
deleted file mode 100644
index 222fcd2..0000000
--- a/0021-dracut-install-FIPS-workaround-for-fipscheck-dir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From cce471c9cec7f501614a025e114dd7631ee3a734 Mon Sep 17 00:00:00 2001
-From: Milan Broz <mbroz@redhat.com>
-Date: Thu, 23 Aug 2012 19:55:26 +0200
-Subject: [PATCH] dracut-install: FIPS workaround for fipscheck dir
-
-In recent Fedora distro are all hmac files located in /lib
-(to avoid multiarch conflict).
-
-When installing hmac file, also install files from these locations.
-
-Signed-off-by: Milan Broz <mbroz@redhat.com>
----
- install/dracut-install.c | 20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 0571c2a..f06f5ac 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -321,7 +321,7 @@ static int resolve_deps(const char *src)
- }
- 
- /* Install ".<filename>.hmac" file for FIPS self-checks */
--static int hmac_install(const char *src, const char *dst)
-+static int hmac_install(const char *src, const char *dst, const char *hmacpath)
- {
-         char *srcpath = strdup(src);
-         char *dstpath = strdup(dst);
-@@ -332,10 +332,20 @@ static int hmac_install(const char *src, const char *dst)
-         if (endswith(src, ".hmac"))
-                 return 0;
- 
-+	if (!hmacpath) {
-+                hmac_install(src, dst, "/lib/fipscheck");
-+                hmac_install(src, dst, "/lib64/fipscheck");
-+        }
-+
-         srcpath[dlen] = '\0';
-         dstpath[dir_len(dst)] = '\0';
--        asprintf(&srchmacname, "%s/.%s.hmac", srcpath, &src[dlen + 1]);
--        asprintf(&dsthmacname, "%s/.%s.hmac", dstpath, &src[dlen + 1]);
-+        if (hmacpath) {
-+                asprintf(&srchmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
-+                asprintf(&dsthmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]);
-+        } else {
-+                asprintf(&srchmacname, "%s/.%s.hmac", srcpath, &src[dlen + 1]);
-+                asprintf(&dsthmacname, "%s/.%s.hmac", dstpath, &src[dlen + 1]);
-+        }
-         log_debug("hmac cp '%s' '%s')", srchmacname, dsthmacname);
-         dracut_install(srchmacname, dsthmacname, false, false, true);
-         free(dsthmacname);
-@@ -480,7 +490,7 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
-                 free(abspath);
-                 if (arg_hmac) {
-                         /* copy .hmac files also */
--                        hmac_install(src, dst);
-+                        hmac_install(src, dst, NULL);
-                 }
- 
-                 return 0;
-@@ -491,7 +501,7 @@ static int dracut_install(const char *src, const char *dst, bool isdir, bool res
-                         ret += resolve_deps(src);
-                 if (arg_hmac) {
-                         /* copy .hmac files also */
--                        hmac_install(src, dst);
-+                        hmac_install(src, dst, NULL);
-                 }
-         }
- 
diff --git a/0022-Require-fipscheck-and-libssl-in-FIPS-module.patch b/0022-Require-fipscheck-and-libssl-in-FIPS-module.patch
deleted file mode 100644
index a813e5d..0000000
--- a/0022-Require-fipscheck-and-libssl-in-FIPS-module.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 104727ad6ea255d2f774c3140ccadde68a7265fb Mon Sep 17 00:00:00 2001
-From: Milan Broz <mbroz@redhat.com>
-Date: Thu, 23 Aug 2012 19:55:27 +0200
-Subject: [PATCH] Require fipscheck and libssl in FIPS module
-
-To properly perform verification in FIPS mode,
-we need to install fipscheck and libssl explicitly.
-
-(cryptsetup seems to be the first user of this verification in ramdisk...)
-
-Signed-off-by: Milan Broz <mbroz@redhat.com>
----
- modules.d/01fips/module-setup.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
-index 2517964..103a479 100755
---- a/modules.d/01fips/module-setup.sh
-+++ b/modules.d/01fips/module-setup.sh
-@@ -33,11 +33,11 @@ install() {
-     inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
-     inst_script "$moddir/fips.sh" /sbin/fips.sh
- 
--    dracut_install sha512hmac rmmod insmod mount uname umount
-+    dracut_install sha512hmac rmmod insmod mount uname umount fipscheck
- 
-     inst_libdir_file libsoftokn3.so libsoftokn3.so \
-         libsoftokn3.chk libfreebl3.so libfreebl3.chk \
--        'hmaccalc/sha512hmac.hmac'
-+        libssl.so 'hmaccalc/sha512hmac.hmac'
- 
-     dracut_install -o prelink
- }
diff --git a/0023-make-splitsep-preserve-backslashes-RHBZ-851295.patch b/0023-make-splitsep-preserve-backslashes-RHBZ-851295.patch
deleted file mode 100644
index 091119b..0000000
--- a/0023-make-splitsep-preserve-backslashes-RHBZ-851295.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 32b2fb8a276ce1107a7784b96fab56a1b4dc05a1 Mon Sep 17 00:00:00 2001
-From: Will Woods <wwoods@redhat.com>
-Date: Thu, 23 Aug 2012 16:56:01 -0400
-Subject: [PATCH] make splitsep preserve backslashes (RHBZ#851295)
-
-splitsep() would drop escapes from its inputs. For example:
-
-  splitsep ':' 'first:middle:\e\s\c\a\p\e\d' a b c
-
-gave a='first', b='middle', c='escaped'. Even worse:
-
-  splitsep ':' '\e\s\c\a\p\e\d:middle:last' a b c
-
-gave a='escaped', b='escaped', c='escaped:middle:last'.
-
-This fixes the quoting so both calls return the values you'd expect
-(e.g. 'first', 'middle', '\e\s\c\a\p\e\d').
----
- modules.d/99base/dracut-lib.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 381b4dd..60b4cb1 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -271,12 +271,12 @@ splitsep() {
- 
-     while [ -n "$str" -a "$#" -gt 1 ]; do
-         tmp="${str%%$sep*}"
--        eval "$1=${tmp}"
--        str="${str#$tmp}"
-+        eval "$1='${tmp}'"
-+        str="${str#"$tmp"}"
-         str="${str#$sep}"
-         shift
-     done
--    [ -n "$str" -a -n "$1" ] && eval "$1=$str"
-+    [ -n "$str" -a -n "$1" ] && eval "$1='$str'"
-     debug_on
-     return 0
- }
diff --git a/0024-crypt-do-not-run-systemd-crypt-generator.patch b/0024-crypt-do-not-run-systemd-crypt-generator.patch
deleted file mode 100644
index 096f811..0000000
--- a/0024-crypt-do-not-run-systemd-crypt-generator.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8a7f561ee50c096fc8bb9e959da447023e6973ce Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 4 Sep 2012 09:49:45 +0200
-Subject: [PATCH] crypt: do not run systemd crypt generator
-
-"systemctl daemon-reload" does it already for us
----
- modules.d/90crypt/crypt-run-generator.sh | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh
-index f2f2da1..224e511 100755
---- a/modules.d/90crypt/crypt-run-generator.sh
-+++ b/modules.d/90crypt/crypt-run-generator.sh
-@@ -12,7 +12,6 @@ if [ -f /etc/crypttab ]; then
- fi
- 
- echo "$luks $dev" >> /etc/crypttab
--/lib/systemd/system-generators/systemd-cryptsetup-generator
- systemctl daemon-reload
- systemctl start cryptsetup.target
- exit 0
diff --git a/0025-FIPS-workaround-for-fipscheck-dir.patch b/0025-FIPS-workaround-for-fipscheck-dir.patch
deleted file mode 100644
index 27fa9c8..0000000
--- a/0025-FIPS-workaround-for-fipscheck-dir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 00083a0909130cc47e4ad876f0151509f4acf016 Mon Sep 17 00:00:00 2001
-From: Milan Broz <mbroz@redhat.com>
-Date: Fri, 24 Aug 2012 13:31:57 +0200
-Subject: [PATCH] FIPS workaround for fipscheck dir
-
-Also patch old install path... (used in Fedora 17)
-
-Signed-off-by: Milan Broz <mbroz@redhat.com>
----
- dracut-functions.sh | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index c328f9f..d089b7f 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -620,6 +620,12 @@ else
-             if [[ -e "${_src%/*}/.${_src##*/}.hmac" ]]; then
-                 inst "${_src%/*}/.${_src##*/}.hmac" "${_target%/*}/.${_target##*/}.hmac"
-             fi
-+            if [[ -e "/lib/fipscheck/${_src##*/}.hmac" ]]; then
-+                inst "/lib/fipscheck/${_src##*/}.hmac" "/lib/fipscheck/${_target##*/}.hmac"
-+            fi
-+            if [[ -e "/lib64/fipscheck/${_src##*/}.hmac" ]]; then
-+                inst "/lib64/fipscheck/${_src##*/}.hmac" "/lib64/fipscheck/${_target##*/}.hmac"
-+            fi
-         fi
-         ddebug "Installing $_src"
-         cp --reflink=auto --sparse=auto -pfL "$_src" "${initdir}/$_target"
-@@ -657,6 +663,12 @@ else
-                 if [[ -e "${_src%/*}/.${_src##*/}.hmac" ]]; then
-                     inst "${_src%/*}/.${_src##*/}.hmac" "${_dest%/*}/.${_dest##*/}.hmac"
-                 fi
-+                if [[ -e "/lib/fipscheck/${_src##*/}.hmac" ]]; then
-+                    inst "/lib/fipscheck/${_src##*/}.hmac" "/lib/fipscheck/${_dest##*/}.hmac"
-+                fi
-+                if [[ -e "/lib64/fipscheck/${_src##*/}.hmac" ]]; then
-+                    inst "/lib64/fipscheck/${_src##*/}.hmac" "/lib64/fipscheck/${_dest##*/}.hmac"
-+                fi
-             fi
-             _reallib=$(readlink -f "$_src")
-             inst_simple "$_reallib" "$_reallib"
diff --git a/0026-use-check_block_and_slaves-in-for_each_host_dev_and_.patch b/0026-use-check_block_and_slaves-in-for_each_host_dev_and_.patch
deleted file mode 100644
index ab5de6a..0000000
--- a/0026-use-check_block_and_slaves-in-for_each_host_dev_and_.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a999414eaf2e136e8bb08065bd53e51f4d544a9b Mon Sep 17 00:00:00 2001
-From: Dave Young <dyoung@redhat.com>
-Date: Tue, 28 Aug 2012 10:05:49 +0800
-Subject: [PATCH] use check_block_and_slaves in for_each_host_dev_and_slaves
-
-for_each_host_dev_and_slaves currently is used in some module check()
-functions and it's not necessary iterate all slaves. So use
-check_block_and_slaves instead of check_block_and_slaves_all is fine.
-
-Signed-off-by: Dave Young <dyoung@redhat.com>
----
- dracut-functions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index d089b7f..2399a1d 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -468,7 +468,7 @@ for_each_host_dev_and_slaves()
-     local _dev
-     for _dev in ${host_devs[@]}; do
-         [[ -b "$_dev" ]] || continue
--        check_block_and_slaves_all $_func $(get_maj_min $_dev) && return 0
-+        check_block_and_slaves $_func $(get_maj_min $_dev) && return 0
-     done
-     return 1
- }
diff --git a/0027-dracut-Override-rd.md-settings-if-rd.md.uuid-is-prov.patch b/0027-dracut-Override-rd.md-settings-if-rd.md.uuid-is-prov.patch
deleted file mode 100644
index d5cb881..0000000
--- a/0027-dracut-Override-rd.md-settings-if-rd.md.uuid-is-prov.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From cc4037d12012244b51a1efecdeb121184efe6f67 Mon Sep 17 00:00:00 2001
-From: Vivek Goyal <vgoyal@redhat.com>
-Date: Wed, 5 Sep 2012 17:24:34 -0400
-Subject: [PATCH] dracut: Override rd.md settings if rd.md.uuid is provided
-
-Currently anaconda provides rd.md=0 on kernel's command line as a boot
-time optimization if root is not on md device. But this leads to kdump
-failure. We copy the command line from first kernel and if dump target
-is on md device, it fails as we never try to assemble md devices as
-rd.md=0.
-
-We have already set rd.md.uuid though in /etc/cmdlind.d/ dir providing
-dracut the info about what md devices to assemble. So this patch overrides
-rd.md settings if rd.md.uuid is provided.
-
-This is a stop gap measure to get kdump working on software raid
-devices. Harald seems to have bigger cleanup plans for rd.md. Once
-that happens, this patch will not be needed and things should
-automatically be fixed.
-
-Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
----
- modules.d/90mdraid/parse-md.sh | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/90mdraid/parse-md.sh b/modules.d/90mdraid/parse-md.sh
-index 6920f40..5c50b4c 100755
---- a/modules.d/90mdraid/parse-md.sh
-+++ b/modules.d/90mdraid/parse-md.sh
-@@ -1,12 +1,13 @@
- #!/bin/sh
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
--if ! getargbool 1 rd.md -d -n rd_NO_MD; then
-+
-+MD_UUID=$(getargs rd.md.uuid -d rd_MD_UUID=)
-+
-+if ! [ -n "$MD_UUID" ] || ! getargbool 1 rd.md -d -n rd_NO_MD; then
-     info "rd.md=0: removing MD RAID activation"
-     udevproperty rd_NO_MD=1
- else
--    MD_UUID=$(getargs rd.md.uuid -d rd_MD_UUID=)
--
-     # rewrite the md rules to only process the specified raid array
-     if [ -n "$MD_UUID" ]; then
-         for f in /etc/udev/rules.d/65-md-incremental*.rules; do
diff --git a/0028-dmsquash-live-dmsquash-live-root.sh-Physically-write.patch b/0028-dmsquash-live-dmsquash-live-root.sh-Physically-write.patch
deleted file mode 100644
index 365fef4..0000000
--- a/0028-dmsquash-live-dmsquash-live-root.sh-Physically-write.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0db77f5a2b32ed0bc3587fa54bc078e286f16947 Mon Sep 17 00:00:00 2001
-From: Frederick Grose <fgrose@gmail.com>
-Date: Thu, 6 Sep 2012 10:48:37 +0200
-Subject: [PATCH] dmsquash-live/dmsquash-live-root.sh: Physically write
- overlay reset at time of request
-
----
- 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 f8bfca6..a7bb202 100755
---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
-+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-@@ -98,7 +98,7 @@ do_live_overlay() {
-         if [ -f /run/initramfs/overlayfs$pathspec -a -w /run/initramfs/overlayfs$pathspec ]; then
-             losetup $OVERLAY_LOOPDEV /run/initramfs/overlayfs$pathspec
-             if [ -n "$reset_overlay" ]; then
--                dd if=/dev/zero of=$OVERLAY_LOOPDEV bs=64k count=1 2>/dev/null
-+                dd if=/dev/zero of=$OVERLAY_LOOPDEV bs=64k count=1 conv=fsync 2>/dev/null
-             fi
-             setup="yes"
-         fi
diff --git a/0029-unquote-nbd-port.patch b/0029-unquote-nbd-port.patch
deleted file mode 100644
index cbbd971..0000000
--- a/0029-unquote-nbd-port.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ca121b1a5c70c0ca15a1c797e5af5df4592c6e80 Mon Sep 17 00:00:00 2001
-From: Wim Muskee <wimmuskee@gmail.com>
-Date: Sat, 25 Aug 2012 13:42:12 +0200
-Subject: [PATCH] unquote nbd port
-
-Name based connects fail because of the quotes around the $nbdport.
-For name based connects, the -N option also gets included. For
-instance nbd-client 192.168.0.1 '-N ltsp' /dev/nbd0.
-I believe the quotes are not necessary for actual port numbers.
----
- modules.d/95nbd/nbdroot.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh
-index 7656120..4d06425 100755
---- a/modules.d/95nbd/nbdroot.sh
-+++ b/modules.d/95nbd/nbdroot.sh
-@@ -95,7 +95,7 @@ while [ ! -b /dev/nbd0 ]; do
-     i=$(( $i + 1))
- done
- 
--nbd-client $preopts "$nbdserver" "$nbdport" /dev/nbd0 $opts || exit 1
-+nbd-client $preopts "$nbdserver" $nbdport /dev/nbd0 $opts || exit 1
- 
- # If we didn't get a root= on the command line, then we need to
- # add the udev rules for mounting the nbd0 device
diff --git a/0030-ifcfg-write-ifcfg.sh-add-IPV6INIT-yes-for-IPv6.patch b/0030-ifcfg-write-ifcfg.sh-add-IPV6INIT-yes-for-IPv6.patch
deleted file mode 100644
index 56be606..0000000
--- a/0030-ifcfg-write-ifcfg.sh-add-IPV6INIT-yes-for-IPv6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 32ec0a762d1dce36f20857ffd222863a3d550ed7 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 6 Sep 2012 11:38:48 +0200
-Subject: [PATCH] ifcfg/write-ifcfg.sh: add "IPV6INIT=yes" for IPv6
-
-https://bugzilla.redhat.com/show_bug.cgi?id=852808
----
- modules.d/45ifcfg/write-ifcfg.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
-index b62170d..8cc3796 100755
---- a/modules.d/45ifcfg/write-ifcfg.sh
-+++ b/modules.d/45ifcfg/write-ifcfg.sh
-@@ -105,6 +105,7 @@ for netif in $IFACES ; do
-         [ -n "$mtu" ] && echo "MTU=$mtu"
-         if [ -f /tmp/net.$netif.lease ]; then
-             strstr "$ip" '*:*:*' &&
-+            echo "IPV6INIT=yes"
-             echo "DHCPV6C=yes"
-             echo "BOOTPROTO=dhcp"
-             cp /tmp/net.$netif.lease /tmp/ifcfg-leases/dhclient-$uuid-$netif.lease
-@@ -112,6 +113,7 @@ for netif in $IFACES ; do
-             # If we've booted with static ip= lines, the override file is there
-             [ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override
-             if strstr "$ip" '*:*:*'; then
-+                echo "IPV6INIT=yes"
-                 echo "IPV6_AUTOCONF=no"
-                 echo "IPV6ADDR=$ip/$mask"
-             else
diff --git a/0031-kernel-modules-module-setup.sh-add-yenta_socket-to-t.patch b/0031-kernel-modules-module-setup.sh-add-yenta_socket-to-t.patch
deleted file mode 100644
index a6bd651..0000000
--- a/0031-kernel-modules-module-setup.sh-add-yenta_socket-to-t.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ea627292383a893062f64c1c949a102d56fac4e5 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 6 Sep 2012 11:51:31 +0200
-Subject: [PATCH] kernel-modules/module-setup.sh: add yenta_socket to the
- initramfs
-
-https://bugzilla.redhat.com/show_bug.cgi?id=853787
----
- 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 e58b257..f8e2be7 100755
---- a/modules.d/90kernel-modules/module-setup.sh
-+++ b/modules.d/90kernel-modules/module-setup.sh
-@@ -36,7 +36,7 @@ installkernel() {
-         }
- 
-         hostonly='' instmods sr_mod sd_mod scsi_dh scsi_dh_rdac scsi_dh_emc ata_piix
--        hostonly='' instmods pcmcia firewire-ohci
-+        hostonly='' instmods pcmcia firewire-ohci yenta_socket
-         hostonly='' instmods usb_storage sdhci sdhci-pci
- 
-         # arm specific modules
diff --git a/0032-network-fix-ip-ibft-regression.patch b/0032-network-fix-ip-ibft-regression.patch
deleted file mode 100644
index 8db655a..0000000
--- a/0032-network-fix-ip-ibft-regression.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d672bf167c08fa8d12cee0616df781fbba5ad3b0 Mon Sep 17 00:00:00 2001
-From: Chris Leech <cleech@redhat.com>
-Date: Wed, 5 Sep 2012 16:54:04 -0700
-Subject: [PATCH] network: fix ip=ibft regression
-
-It looks like ip=ibft has been busted since
-  25aa3c5 network: refactor stuff from netroot/parse-ip-opts to net-lib
-which moved ibft parsing code out to the ibft_to_cmdline function.
-
-The use of ifname_mac was partially replaced by a local mac, but not
-completely, causing ibft_to_cmdline to abort without generating network
-configuration options.
-
-Signed-off-by: Chris Leech <cleech@redhat.com>
----
- modules.d/40network/net-lib.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
-index 641b21e..10b630e 100644
---- a/modules.d/40network/net-lib.sh
-+++ b/modules.d/40network/net-lib.sh
-@@ -145,8 +145,8 @@ ibft_to_cmdline() {
-         for iface in /sys/firmware/ibft/ethernet*; do
-             [ -e ${iface}/mac ] || continue
-             mac=$(read a < ${iface}/mac; echo $a)
--            [ -z "$ifname_mac" ] && continue
--            dev=$(set_ifname ibft $ifname_mac)
-+            [ -z "$mac" ] && continue
-+            dev=$(set_ifname ibft $mac)
-             dhcp=$(read a < ${iface}/dhcp; echo $a)
-             if [ -n "$dhcp" ]; then
-                 echo "ip=$dev:dhcp"
diff --git a/0033-hide-setsid-help-output-in-emergency_shell.patch b/0033-hide-setsid-help-output-in-emergency_shell.patch
deleted file mode 100644
index fc81b35..0000000
--- a/0033-hide-setsid-help-output-in-emergency_shell.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3bff70ef15dbda8b89ff5e998c79f6492e58b1ae Mon Sep 17 00:00:00 2001
-From: Will Woods <wwoods@redhat.com>
-Date: Tue, 28 Aug 2012 09:43:52 -0400
-Subject: [PATCH] hide 'setsid --help' output in emergency_shell()
-
-When emergency_shell() happens, it does 'setsid --help' to figure out if
-the setsid binary supports the '-c' flag (to set the controlling tty).
-
-This output shows up in the logs (and on-screen if you're using
-rd.debug), which keeps confusing people looking for other problems.
-
-Using "case" instead of "strstr" lets us avoid this.
----
- modules.d/99base/dracut-lib.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 60b4cb1..fbe6f91 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -890,7 +890,7 @@ _emergency_shell()
-             _ctty=/dev/$_ctty
-         fi
-         [ -c "$_ctty" ] || _ctty=/dev/tty1
--        strstr "$(setsid --help 2>/dev/null)" "ctty" && CTTY="-c"
-+        case "$(/usr/bin/setsid --help 2>&1)" in *--ctty*) CTTY="--ctty";; esac
-         setsid $CTTY /bin/sh -i -l 0<$_ctty 1>$_ctty 2>&1
-     fi
- }
diff --git a/0034-mdraid-parse-md.sh-fixed-commit-cc4037d12012244b51a1.patch b/0034-mdraid-parse-md.sh-fixed-commit-cc4037d12012244b51a1.patch
deleted file mode 100644
index 360a0f2..0000000
--- a/0034-mdraid-parse-md.sh-fixed-commit-cc4037d12012244b51a1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 641a8558f430bd4429c5743a27a2ec3b8729803e Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 6 Sep 2012 16:16:31 +0200
-Subject: [PATCH] mdraid/parse-md.sh: fixed commit
- cc4037d12012244b51a1efecdeb121184efe6f67
-
-my fault, sorry.
----
- modules.d/90mdraid/parse-md.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90mdraid/parse-md.sh b/modules.d/90mdraid/parse-md.sh
-index 5c50b4c..69d58f8 100755
---- a/modules.d/90mdraid/parse-md.sh
-+++ b/modules.d/90mdraid/parse-md.sh
-@@ -4,7 +4,7 @@
- 
- MD_UUID=$(getargs rd.md.uuid -d rd_MD_UUID=)
- 
--if ! [ -n "$MD_UUID" ] || ! getargbool 1 rd.md -d -n rd_NO_MD; then
-+if ! [ -n "$MD_UUID" ] && ! getargbool 1 rd.md -d -n rd_NO_MD; then
-     info "rd.md=0: removing MD RAID activation"
-     udevproperty rd_NO_MD=1
- else
diff --git a/0035-apply-live-updates.sh-handle-updates-for-run.patch b/0035-apply-live-updates.sh-handle-updates-for-run.patch
deleted file mode 100644
index 36e1f53..0000000
--- a/0035-apply-live-updates.sh-handle-updates-for-run.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 44f77ac1b06997404ffc67958bdcaaf392d0bcfd Mon Sep 17 00:00:00 2001
-From: Will Woods <wwoods@redhat.com>
-Date: Wed, 29 Aug 2012 18:58:15 -0400
-Subject: [PATCH] apply-live-updates.sh: handle updates for /run
-
-/run will get mounted at $NEWROOT/run after switch_root, but it's not
-there yet. bind-mount it in place so updates for /run actually land in
-/run.
-
-(also: remove a redundant check for existing directories. mkdir -p
-doesn't do anything if the directory already exists.)
----
- modules.d/90dmsquash-live/apply-live-updates.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90dmsquash-live/apply-live-updates.sh b/modules.d/90dmsquash-live/apply-live-updates.sh
-index 61da4bf..d620f2c 100755
---- a/modules.d/90dmsquash-live/apply-live-updates.sh
-+++ b/modules.d/90dmsquash-live/apply-live-updates.sh
-@@ -2,14 +2,16 @@
- 
- if [ -b /dev/mapper/live-rw ] && [ -d /updates ]; then
-     info "Applying updates to live image..."
-+    mount -o bind /run $NEWROOT/run
-     # avoid overwriting symlinks (e.g. /lib -> /usr/lib) with directories
-     (
-         cd /updates
-         find . -depth -type d | while read dir; do
--            [ -d "$NEWROOT/$dir" ] || mkdir -p "$NEWROOT/$dir"
-+            mkdir -p "$NEWROOT/$dir"
-         done
-         find . -depth \! -type d | while read file; do
-             cp -a "$file" "$NEWROOT/$file"
-         done
-     )
-+    umount $NEWROOT/run
- fi
diff --git a/0036-iscsi-parse-iscsiroot.sh-delay-loading-of-iscsi-modu.patch b/0036-iscsi-parse-iscsiroot.sh-delay-loading-of-iscsi-modu.patch
deleted file mode 100644
index 4a4de99..0000000
--- a/0036-iscsi-parse-iscsiroot.sh-delay-loading-of-iscsi-modu.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From dff1671f8f21b88479ad022623ff26e40e958bd6 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 10 Sep 2012 15:49:37 +0200
-Subject: [PATCH] iscsi/parse-iscsiroot.sh: delay loading of iscsi modules
-
----
- modules.d/95iscsi/parse-iscsiroot.sh | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
-index e7fc224..cc59f5a 100755
---- a/modules.d/95iscsi/parse-iscsiroot.sh
-+++ b/modules.d/95iscsi/parse-iscsiroot.sh
-@@ -53,12 +53,6 @@ if [ -n "$iscsiroot" ] ; then
-     [ -z "$netroot" ] || [ "$netroot" = "iscsi" ] && netroot=iscsi:$iscsiroot
- fi
- 
--modprobe -q qla4xxx
--modprobe -q cxgb3i
--modprobe -q cxgb4i
--modprobe -q bnx2i
--modprobe -q be2iscsi
--
- # iscsi_firmware does not need argument checking
- if [ -n "$iscsi_firmware" ] ; then
-     netroot=${netroot:-iscsi}
-@@ -69,6 +63,12 @@ fi
- # If it's not iscsi we don't continue
- [ "${netroot%%:*}" = "iscsi" ] || return
- 
-+modprobe -q qla4xxx
-+modprobe -q cxgb3i
-+modprobe -q cxgb4i
-+modprobe -q bnx2i
-+modprobe -q be2iscsi
-+
- if [ -z "$iscsi_firmware" ] ; then
-     type parse_iscsi_root >/dev/null 2>&1 || . /lib/net-lib.sh
-     parse_iscsi_root "$netroot" || return
diff --git a/0037-nfs-install-all-nfs-submodules.patch b/0037-nfs-install-all-nfs-submodules.patch
deleted file mode 100644
index 063cd93..0000000
--- a/0037-nfs-install-all-nfs-submodules.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ba111df2b99f9f1dc5c51442ad92bcefbf16bd91 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 10 Sep 2012 15:49:58 +0200
-Subject: [PATCH] nfs: install all nfs submodules
-
----
- modules.d/95nfs/module-setup.sh | 2 +-
- test/TEST-50-MULTINIC/test.sh   | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
-index ecef635..8a12ec7 100755
---- a/modules.d/95nfs/module-setup.sh
-+++ b/modules.d/95nfs/module-setup.sh
-@@ -25,7 +25,7 @@ depends() {
- }
- 
- installkernel() {
--    instmods nfs sunrpc ipv6
-+    instmods nfs sunrpc ipv6 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files
- }
- 
- install() {
-diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
-index 3771a14..066ad80 100755
---- a/test/TEST-50-MULTINIC/test.sh
-+++ b/test/TEST-50-MULTINIC/test.sh
-@@ -246,14 +246,14 @@ test_setup() {
-     # Make server's dracut image
-     $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-         -m "dash udev-rules base rootfs-block debug kernel-modules watchdog" \
--        -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 i6300esbwdt" \
-+        -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esbwdt" \
-         -f $TESTDIR/initramfs.server $KVERSION || return 1
- 
-     # Make client's dracut image
-     $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-         -o "plymouth" \
-         -a "debug" \
--        -d "af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfs sunrpc i6300esbwdt" \
-+        -d "af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esbwdt" \
-         -f $TESTDIR/initramfs.testing $KVERSION || return 1
- }
- 
diff --git a/0038-move-get_persistent_dev-to-dracut-functions.sh.patch b/0038-move-get_persistent_dev-to-dracut-functions.sh.patch
deleted file mode 100644
index 5eedeed..0000000
--- a/0038-move-get_persistent_dev-to-dracut-functions.sh.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ff0636635a0d20562d86ab5f4450bb8066dbd7dc Mon Sep 17 00:00:00 2001
-From: Dave Young <dyoung@redhat.com>
-Date: Mon, 10 Sep 2012 16:10:46 +0800
-Subject: [PATCH] move get_persistent_dev to dracut-functions.sh
-
-kdump module also need to convert dev name to udev symlinks.
-So better to move function get_persistent_dev() to dracut-functions.sh
-
-Also in this patch improvement and fix the original function:
-a) use udevadm info --query=name to get the kernel name.
-   This will fix the issue caused by passing symbolic link of a device.
-b) fix a bug to compare $_tmp instead of $i with $_dev. Really sorry,
-   should have tested more carefully.
-
-Signed-off-by: Dave Young <dyoung@redhat.com>
----
- dracut-functions.sh              | 15 +++++++++++++++
- modules.d/99base/module-setup.sh | 13 -------------
- 2 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 2399a1d..e6200c2 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -239,6 +239,21 @@ else
-     }
- fi
- 
-+get_persistent_dev() {
-+    local i _tmp _dev
-+
-+    _dev=$(udevadm info --query=name --name="$1" 2>/dev/null)
-+    [ -z "$_dev" ] && return
-+
-+    for i in /dev/disk/by-id/*; do
-+        _tmp=$(udevadm info --query=name --name="$i" 2>/dev/null)
-+        if [ "$_tmp" = "$_dev" ]; then
-+            echo $i
-+            return
-+        fi
-+    done
-+}
-+
- # get_fs_env <device>
- # Get and set the ID_FS_TYPE and ID_FS_UUID variable from udev for a device.
- # Example:
-diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index 8a18100..115b544 100755
---- a/modules.d/99base/module-setup.sh
-+++ b/modules.d/99base/module-setup.sh
-@@ -11,19 +11,6 @@ depends() {
-     return 0
- }
- 
--get_persistent_dev() {
--    local i _tmp
--    local _dev=${1##*/}
--
--    for i in /dev/disk/by-id/*; do
--        _tmp=$(readlink $i)
--        if [ "$i" = "$_dev" ]; then
--            echo $i
--            return
--        fi
--    done
--}
--
- install() {
-     local _d
-     dracut_install mount mknod mkdir pidof sleep chroot \
diff --git a/0039-resume-resume.sh-prevent-resume-not-found.patch b/0039-resume-resume.sh-prevent-resume-not-found.patch
deleted file mode 100644
index 77d2392..0000000
--- a/0039-resume-resume.sh-prevent-resume-not-found.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0e32ce32194b2a031cf7a09798fdf0c322cf2f38 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 18 Sep 2012 13:37:35 +0200
-Subject: [PATCH] resume/resume.sh: prevent "resume: not found"
-
-Problem lies in modules.d/95resume:
-
-[ -x $(command -v resume) ] && command resume $a_splash "$resume"
-
-``command -v resume'' prints nothing and ``test -x'' returns 0.
-
-Thanks to Consus!
----
- modules.d/95resume/resume.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/95resume/resume.sh b/modules.d/95resume/resume.sh
-index 408ce46..6d69b61 100755
---- a/modules.d/95resume/resume.sh
-+++ b/modules.d/95resume/resume.sh
-@@ -14,7 +14,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
-             a_splash="-P splash=n"
-         ;;
-     esac
--    [ -x $(command -v resume) ] && command resume $a_splash "$resume"
-+    [ -x "$(command -v resume)" ] && command resume $a_splash "$resume"
- 
-     # parsing the output of ls is Bad, but until there is a better way...
-     ls -lH "$resume" | (
diff --git a/0040-bye-bye-iscsi_wait_scan-.-officially-gone-for-kernel.patch b/0040-bye-bye-iscsi_wait_scan-.-officially-gone-for-kernel.patch
deleted file mode 100644
index 951c2b8..0000000
--- a/0040-bye-bye-iscsi_wait_scan-.-officially-gone-for-kernel.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0fc0dcff60de5d903985944d760d53c093f6687f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 18 Sep 2012 13:39:54 +0200
-Subject: [PATCH] bye bye iscsi_wait_scan ... officially gone for kernel 3.6
-
----
- modules.d/01fips/fips.sh                | 2 --
- modules.d/01fips/module-setup.sh        | 1 -
- modules.d/98systemd/dracut-initqueue.sh | 1 -
- modules.d/99base/init.sh                | 1 -
- 4 files changed, 5 deletions(-)
-
-diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
-index 324e062..48ad0e6 100755
---- a/modules.d/01fips/fips.sh
-+++ b/modules.d/01fips/fips.sh
-@@ -32,8 +32,6 @@ mount_boot()
-                     udevadm settle --timeout=30
-                 fi
-                 [ -e $boot ] && break
--                modprobe scsi_wait_scan && rmmod scsi_wait_scan
--                [ -e $boot ] && break
-                 sleep 0.5
-                 i=$(($i+1))
-                 [ $i -gt 40 ] && break
-diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
-index 103a479..6b3e444 100755
---- a/modules.d/01fips/module-setup.sh
-+++ b/modules.d/01fips/module-setup.sh
-@@ -24,7 +24,6 @@ installkernel() {
-             echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
-         fi
-     done
--    hostonly='' instmods scsi_wait_scan
- }
- 
- install() {
-diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
-index 773e4cd..e9da432 100755
---- a/modules.d/98systemd/dracut-initqueue.sh
-+++ b/modules.d/98systemd/dracut-initqueue.sh
-@@ -25,7 +25,6 @@ while :; do
-     check_finished && break
- 
-     udevsettle
--    modprobe -q scsi_wait_scan && modprobe -q -r scsi_wait_scan
- 
-     check_finished && break
- 
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 4c5a2f8..16c8958 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -156,7 +156,6 @@ while :; do
-     check_finished && break
- 
-     udevsettle
--    modprobe -q scsi_wait_scan && modprobe -q -r scsi_wait_scan
- 
-     check_finished && break
- 
diff --git a/0041-45url-lib-url-lib.sh-give-info-what-URL-curl-failed-.patch b/0041-45url-lib-url-lib.sh-give-info-what-URL-curl-failed-.patch
deleted file mode 100644
index 8d690d1..0000000
--- a/0041-45url-lib-url-lib.sh-give-info-what-URL-curl-failed-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 914f531f3955e8416e6098c094a1356a0e7c9d81 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 18 Sep 2012 16:29:42 +0200
-Subject: [PATCH] 45url-lib/url-lib.sh: give info what URL curl failed to
- download
-
-https://bugzilla.redhat.com/show_bug.cgi?id=857836
-
-Also allow self signed Certs and use "--insecure".
-
-https://bugzilla.redhat.com/show_bug.cgi?id=852229
----
- modules.d/45url-lib/url-lib.sh | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
-index e9ece70..a8069ef 100755
---- a/modules.d/45url-lib/url-lib.sh
-+++ b/modules.d/45url-lib/url-lib.sh
-@@ -54,7 +54,7 @@ add_url_handler() {
- 
- export CURL_HOME="/run/initramfs/url-lib"
- mkdir -p $CURL_HOME
--curl_args="--location --retry 3 --fail --show-error"
-+curl_args="--location --retry 3 --fail --show-error --insecure"
- 
- curl_fetch_url() {
-     local url="$1" outloc="$2"
-@@ -66,7 +66,10 @@ curl_fetch_url() {
-         ( cd "$outdir"; curl $curl_args --remote-name "$url" || return $? )
-         outloc="$outdir/$(ls -A $outdir)"
-     fi
--    [ -f "$outloc" ] || return 253
-+    if ! [ -f "$outloc" ]; then
-+	    warn "Downloading '$url' failed!"
-+	    return 253
-+    fi
-     if [ -z "$2" ]; then echo "$outloc" ; fi
- }
- add_url_handler curl_fetch_url http https ftp
diff --git a/0042-ismounted-fix.patch b/0042-ismounted-fix.patch
deleted file mode 100644
index f6ef0fc..0000000
--- a/0042-ismounted-fix.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From d9a7ea5b438125ac1c8cf0d19c5f0b38fd21bbe9 Mon Sep 17 00:00:00 2001
-From: Dave Young <dyoung@redhat.com>
-Date: Mon, 17 Sep 2012 18:01:03 +0800
-Subject: [PATCH] ismounted fix
-
-ismounted handles both find-by-dev and find-by-mnt, but there's two issues:
-1. for find-by-dev, it use readlink to get the canonical dev name, but
-   lvm is different with other devices, the canonical name for lvm devices
-   are symlinks like /dev/mapper/vg-lv00
-2. for nfs mounting, just use [ -b $dev ] is not enough, it need being handled
-   seperately.
-
-Per Karel Zak's suggestion, findmnt util is suitable for this purpose, it
-handles these cases well, so just use findmnt instead of implement all the
-logic by ourselves. Thanks, Karel.
-
-Signed-off-by: Dave Young <dyoung@redhat.com>
----
- modules.d/99base/dracut-lib.sh   | 19 +------------------
- modules.d/99base/module-setup.sh |  2 +-
- 2 files changed, 2 insertions(+), 19 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index fbe6f91..6fd4e0a 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -452,27 +452,10 @@ udevproperty() {
-     fi
- }
- 
--find_mount() {
--    local dev mnt etc wanted_dev
--    wanted_dev="$(readlink -e -q $1)"
--    while read dev mnt etc; do
--        [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
--    done < /proc/mounts
--    return 1
--}
--
- # usage: ismounted <mountpoint>
- # usage: ismounted /dev/<device>
- ismounted() {
--    if [ -b "$1" ]; then
--        find_mount "$1" > /dev/null && return 0
--        return 1
--    fi
--
--    while read a m a; do
--        [ "$m" = "$1" ] && return 0
--    done < /proc/mounts
--    return 1
-+    findmnt "$1" > /dev/null
- }
- 
- wait_for_if_up() {
-diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index 115b544..6cc4ad2 100755
---- a/modules.d/99base/module-setup.sh
-+++ b/modules.d/99base/module-setup.sh
-@@ -13,7 +13,7 @@ depends() {
- 
- install() {
-     local _d
--    dracut_install mount mknod mkdir pidof sleep chroot \
-+    dracut_install mount mknod mkdir pidof sleep chroot findmnt\
-         sed ls flock cp mv dmesg rm ln rmmod mkfifo umount readlink setsid
-     inst $(command -v modprobe) /sbin/modprobe
- 
diff --git a/0043-dash-compat-use-2-1-rather-than.patch b/0043-dash-compat-use-2-1-rather-than.patch
deleted file mode 100644
index 27238ff..0000000
--- a/0043-dash-compat-use-2-1-rather-than.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From aa09b74a412d5511b533b6d22da51868518ef138 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 20 Sep 2012 10:26:14 +0200
-Subject: [PATCH] dash compat: use "2>&1" rather than "&>"
-
----
- modules.d/04watchdog/watchdog.sh     | 2 +-
- modules.d/90mdraid/module-setup.sh   | 4 ++--
- modules.d/90qemu-net/module-setup.sh | 4 ++--
- modules.d/90qemu/module-setup.sh     | 4 ++--
- modules.d/96securityfs/securityfs.sh | 2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/modules.d/04watchdog/watchdog.sh b/modules.d/04watchdog/watchdog.sh
-index a3fdc26..14c92aa 100755
---- a/modules.d/04watchdog/watchdog.sh
-+++ b/modules.d/04watchdog/watchdog.sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- if [ -e /dev/watchdog ]; then
- 	if [ ! -e /tmp/watchdog_timeout ]; then
--		wdctl -s 60 /dev/watchdog &>/dev/null
-+		wdctl -s 60 /dev/watchdog >/dev/null 2>&1
- 		> /tmp/watchdog_timeout
- 	fi
- 	info "Triggering watchdog"
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 6119226..3c3f057 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -66,10 +66,10 @@ install() {
-     inst_rules "$moddir/65-md-incremental-imsm.rules"
- 
-     # guard against pre-3.0 mdadm versions, that can't handle containers
--    if ! mdadm -Q -e imsm /dev/null &> /dev/null; then
-+    if ! mdadm -Q -e imsm /dev/null >/dev/null 2>&1; then
-         inst_hook pre-trigger 30 "$moddir/md-noimsm.sh"
-     fi
--    if ! mdadm -Q -e ddf /dev/null &> /dev/null; then
-+    if ! mdadm -Q -e ddf /dev/null >/dev/null 2>&1; then
-         inst_hook pre-trigger 30 "$moddir/md-noddf.sh"
-     fi
- 
-diff --git a/modules.d/90qemu-net/module-setup.sh b/modules.d/90qemu-net/module-setup.sh
-index e617230..522a7b5 100755
---- a/modules.d/90qemu-net/module-setup.sh
-+++ b/modules.d/90qemu-net/module-setup.sh
-@@ -3,8 +3,8 @@
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
- check() {
--    if type -P systemd-detect-virt &>/dev/null; then
--        vm=$(systemd-detect-virt --vm &>/dev/null)
-+    if type -P systemd-detect-virt >/dev/null 2>&1; then
-+        vm=$(systemd-detect-virt --vm >/dev/null 2>&1)
-         (($? != 0)) && return 255
-         [[ $vm = "qemu" ]] && return 0
-         [[ $vm = "kvm" ]] && return 0
-diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh
-index fc258ac..0dbf081 100755
---- a/modules.d/90qemu/module-setup.sh
-+++ b/modules.d/90qemu/module-setup.sh
-@@ -3,8 +3,8 @@
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
- check() {
--    if type -P systemd-detect-virt &>/dev/null; then
--        vm=$(systemd-detect-virt --vm &>/dev/null)
-+    if type -P systemd-detect-virt >/dev/null 2>&1; then
-+        vm=$(systemd-detect-virt --vm >/dev/null 2>&1)
-         (($? != 0)) && return 255
-         [[ $vm = "qemu" ]] && return 0
-         [[ $vm = "kvm" ]] && return 0
-diff --git a/modules.d/96securityfs/securityfs.sh b/modules.d/96securityfs/securityfs.sh
-index 03ee4dd..f6f4b77 100755
---- a/modules.d/96securityfs/securityfs.sh
-+++ b/modules.d/96securityfs/securityfs.sh
-@@ -5,6 +5,6 @@
- SECURITYFSDIR="/sys/kernel/security"
- export SECURITYFSDIR
- 
--if ! ismounted "${SECURITYFSDIR}"; then
-+if ! findmnt "${SECURITYFSDIR}" >/dev/null 2>&1; then
-    mount -t securityfs -o nosuid,noexec,nodev securityfs ${SECURITYFSDIR} >/dev/null 2>&1
- fi
diff --git a/0044-fallback-to-old-ismounted-if-findmnt-is-not-installe.patch b/0044-fallback-to-old-ismounted-if-findmnt-is-not-installe.patch
deleted file mode 100644
index c2e172f..0000000
--- a/0044-fallback-to-old-ismounted-if-findmnt-is-not-installe.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 4211605000dcb2fef66e90b1c8739f2d02ee1ebc Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 20 Sep 2012 10:36:13 +0200
-Subject: [PATCH] fallback to old ismounted, if findmnt is not installed
-
----
- modules.d/30convertfs/convertfs.sh | 28 +++++++++++++++++++++++++---
- modules.d/99base/dracut-lib.sh     | 29 ++++++++++++++++++++++++++---
- modules.d/99base/module-setup.sh   |  5 +++--
- 3 files changed, 54 insertions(+), 8 deletions(-)
-
-diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh
-index d1d25aa..137664a 100755
---- a/modules.d/30convertfs/convertfs.sh
-+++ b/modules.d/30convertfs/convertfs.sh
-@@ -73,13 +73,35 @@ if [[ ! -e "$testfile" ]]; then
- fi
- rm -f "$testfile"
- 
--ismounted() {
--    while read a m a; do
--        [[ "$m" = "$1" ]] && return 0
-+find_mount() {
-+    local dev mnt etc wanted_dev
-+    wanted_dev="$(readlink -e -q $1)"
-+    while read dev mnt etc; do
-+        [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
-     done < /proc/mounts
-     return 1
- }
- 
-+# usage: ismounted <mountpoint>
-+# usage: ismounted /dev/<device>
-+if command -v findmnt >/dev/null; then
-+    ismounted() {
-+        findmnt "$1" > /dev/null 2>&1
-+    }
-+else
-+    ismounted() {
-+        if [ -b "$1" ]; then
-+            find_mount "$1" > /dev/null && return 0
-+            return 1
-+        fi
-+
-+        while read a m a; do
-+            [ "$m" = "$1" ] && return 0
-+        done < /proc/mounts
-+        return 1
-+    }
-+fi
-+
- # clean up after ourselves no matter how we die.
- cleanup() {
-     echo "Something failed. Move back to the original state"
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 6fd4e0a..1d90010 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -452,11 +452,34 @@ udevproperty() {
-     fi
- }
- 
-+find_mount() {
-+    local dev mnt etc wanted_dev
-+    wanted_dev="$(readlink -e -q $1)"
-+    while read dev mnt etc; do
-+        [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
-+    done < /proc/mounts
-+    return 1
-+}
-+
- # usage: ismounted <mountpoint>
- # usage: ismounted /dev/<device>
--ismounted() {
--    findmnt "$1" > /dev/null
--}
-+if command -v findmnt >/dev/null; then
-+    ismounted() {
-+        findmnt "$1" > /dev/null 2>&1
-+    }
-+else
-+    ismounted() {
-+        if [ -b "$1" ]; then
-+            find_mount "$1" > /dev/null && return 0
-+            return 1
-+        fi
-+
-+        while read a m a; do
-+            [ "$m" = "$1" ] && return 0
-+        done < /proc/mounts
-+        return 1
-+    }
-+fi
- 
- wait_for_if_up() {
-     local cnt=0
-diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index 6cc4ad2..2bcb6a1 100755
---- a/modules.d/99base/module-setup.sh
-+++ b/modules.d/99base/module-setup.sh
-@@ -13,11 +13,12 @@ depends() {
- 
- install() {
-     local _d
--    dracut_install mount mknod mkdir pidof sleep chroot findmnt\
-+    dracut_install mount mknod mkdir pidof sleep chroot \
-         sed ls flock cp mv dmesg rm ln rmmod mkfifo umount readlink setsid
-     inst $(command -v modprobe) /sbin/modprobe
- 
--    dracut_install -o less
-+    dracut_install -o findmnt less
-+
-     if [ ! -e "${initdir}/bin/sh" ]; then
-         dracut_install bash
-         (ln -s bash "${initdir}/bin/sh" || :)
diff --git a/0045-dracut-logger.sh-don-t-check-for-lvl-0-in-dlog_init.patch b/0045-dracut-logger.sh-don-t-check-for-lvl-0-in-dlog_init.patch
deleted file mode 100644
index e1593bb..0000000
--- a/0045-dracut-logger.sh-don-t-check-for-lvl-0-in-dlog_init.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5596b70bd0e6276861842390829f362c1edf4a2d Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 24 Sep 2012 13:04:32 +0200
-Subject: [PATCH] dracut-logger.sh: don't check for *lvl==0 in dlog_init()
-
----
- dracut-logger.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dracut-logger.sh b/dracut-logger.sh
-index dbe26ee..2ffd9fb 100755
---- a/dracut-logger.sh
-+++ b/dracut-logger.sh
-@@ -116,7 +116,7 @@ dlog_init() {
- 
-     if [ -z "$fileloglvl" ]; then
-         [ -w "$logfile" ] && fileloglvl=4 || fileloglvl=0
--    elif (( $fileloglvl >= 0 )); then
-+    elif (( $fileloglvl > 0 )); then
-         __oldumask=$(umask)
-         umask 0377
-         ! [ -e "$logfile" ] && >"$logfile"
-@@ -138,7 +138,7 @@ dlog_init() {
-         fi
-     fi
- 
--    if (( $sysloglvl >= 0 )); then
-+    if (( $sysloglvl > 0 )); then
-         if ! [ -S /dev/log -a -w /dev/log ] || ! command -v logger >/dev/null
-         then
-             # We cannot log to syslog, so turn this facility off.
-@@ -148,7 +148,7 @@ dlog_init() {
-         fi
-     fi
- 
--    if (($sysloglvl >= 0)) || (($kmsgloglvl >= 0 )); then
-+    if (($sysloglvl > 0)) || (($kmsgloglvl > 0 )); then
-         if [ -n "$dracutbasedir" ]; then
-             readonly syslogfacility=user
-         else
diff --git a/0046-use-by-uuid-firstly-in-get_persistent_dev.patch b/0046-use-by-uuid-firstly-in-get_persistent_dev.patch
deleted file mode 100644
index cbca4fc..0000000
--- a/0046-use-by-uuid-firstly-in-get_persistent_dev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f3f97774970e4f83af82ac58d4aab47a4d2ca1c7 Mon Sep 17 00:00:00 2001
-From: Dave Young <dyoung@redhat.com>
-Date: Mon, 24 Sep 2012 10:16:26 +0800
-Subject: [PATCH] use by-uuid firstly in get_persistent_dev
-
-For devices with filesystem, udev /dev/disk/by-uuid/* links are always
-reliable. So improve the get_persistent_dev() by using by-uuid/* firstly,
-and fallback to use by-id/*
-
-Signed-off-by: Dave Young <dyoung@redhat.com>
----
- dracut-functions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index e6200c2..cdadacd 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -245,7 +245,7 @@ get_persistent_dev() {
-     _dev=$(udevadm info --query=name --name="$1" 2>/dev/null)
-     [ -z "$_dev" ] && return
- 
--    for i in /dev/disk/by-id/*; do
-+    for i in /dev/disk/by-uuid/* /dev/disk/by-id/*; do
-         _tmp=$(udevadm info --query=name --name="$i" 2>/dev/null)
-         if [ "$_tmp" = "$_dev" ]; then
-             echo $i
diff --git a/0047-systemd-initrd-switch-root.target-run-switch-root.ta.patch b/0047-systemd-initrd-switch-root.target-run-switch-root.ta.patch
deleted file mode 100644
index bb339cd..0000000
--- a/0047-systemd-initrd-switch-root.target-run-switch-root.ta.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 886b9afcc566dd35bdea8a93f4c4dd5b4a2cc14f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 24 Sep 2012 13:12:42 +0200
-Subject: [PATCH] systemd/initrd-switch-root.target: run switch-root.target
- after cryptsetup
-
-Ensure, that all crypto devices have been queried.
----
- modules.d/98systemd/initrd-switch-root.target | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/98systemd/initrd-switch-root.target b/modules.d/98systemd/initrd-switch-root.target
-index 74647a5..05e0117 100644
---- a/modules.d/98systemd/initrd-switch-root.target
-+++ b/modules.d/98systemd/initrd-switch-root.target
-@@ -12,6 +12,7 @@ Description=Switch Root
- DefaultDependencies=no
- Requires=initrd-switch-root.service
- Before=initrd-switch-root.service
-+After=cryptsetup.target
- AllowIsolate=yes
- Wants=systemd-journald.service
- ConditionPathExists=/etc/initrd-release
diff --git a/0048-crypt-install-etc-crypttab-only-in-host-only-mode.patch b/0048-crypt-install-etc-crypttab-only-in-host-only-mode.patch
deleted file mode 100644
index aa9ab17..0000000
--- a/0048-crypt-install-etc-crypttab-only-in-host-only-mode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3d12d7a2cc5d4fc76ac87514dae2ab27bac8208c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 24 Sep 2012 13:15:08 +0200
-Subject: [PATCH] crypt: install /etc/crypttab only in host-only mode
-
----
- modules.d/90crypt/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
-index 485cbe0..5c1c71b 100755
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -47,7 +47,7 @@ install() {
-     inst_hook cmdline 10 "$moddir/parse-keydev.sh"
-     inst_hook cmdline 30 "$moddir/parse-crypt.sh"
-     inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
--    inst_simple /etc/crypttab
-+    [[ $hostonly ]]  && inst_simple /etc/crypttab
-     inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
- 
-     dracut_install -o \
diff --git a/0049-udev-rules-module-setup.sh-add-udev-groups.patch b/0049-udev-rules-module-setup.sh-add-udev-groups.patch
deleted file mode 100644
index 2dff8ac..0000000
--- a/0049-udev-rules-module-setup.sh-add-udev-groups.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 500d8e600291b69204c67e84282ff0cd90d2f80d Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 24 Sep 2012 13:30:46 +0200
-Subject: [PATCH] udev-rules/module-setup.sh: add udev groups
-
----
- modules.d/95udev-rules/module-setup.sh | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
-index 5e1cce5..00f9923 100755
---- a/modules.d/95udev-rules/module-setup.sh
-+++ b/modules.d/95udev-rules/module-setup.sh
-@@ -37,6 +37,21 @@ install() {
-     inst_dir /run/udev
-     inst_dir /run/udev/rules.d
- 
-+    {
-+        for i in cdrom tape dialout floppy; do
-+            if ! egrep -q "^$i:" "$initdir/etc/group" 2>/dev/null; then
-+                if ! egrep "^$i:" /etc/group 2>/dev/null; then
-+                        case $i in 
-+                            cdrom)   echo "$i:x:11:";;
-+                            dialout) echo "$i:x:18:";;
-+                            floppy)  echo "$i:x:19:";;
-+                            tape)    echo "$i:x:33:";;
-+                        esac
-+                fi
-+            fi
-+        done
-+    } >> "$initdir/etc/group"
-+
-     dracut_install -o \
-         ${udevdir}/ata_id \
-         ${udevdir}/cdrom_id \
diff --git a/0050-TEST-03-USR-MOUNT-create-root.sh-load-btrfs-module-m.patch b/0050-TEST-03-USR-MOUNT-create-root.sh-load-btrfs-module-m.patch
deleted file mode 100644
index 330faf1..0000000
--- a/0050-TEST-03-USR-MOUNT-create-root.sh-load-btrfs-module-m.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 907f75447ba189db0f7b9e88b14e90876037db72 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 24 Sep 2012 13:56:21 +0200
-Subject: [PATCH] TEST-03-USR-MOUNT/create-root.sh: load btrfs module manually
-
----
- test/TEST-03-USR-MOUNT/create-root.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
-index 9a3e561..a9640eb 100755
---- a/test/TEST-03-USR-MOUNT/create-root.sh
-+++ b/test/TEST-03-USR-MOUNT/create-root.sh
-@@ -17,7 +17,7 @@ sfdisk -C 5120 -H 2 -S 32 -L /dev/sdb <<EOF
- ,
- EOF
- 
--
-+modprobe btrfs
- mkfs.btrfs -L dracut /dev/sda2
- mkfs.btrfs -L dracutusr /dev/sdb2
- btrfs device scan /dev/sda2
diff --git a/0051-TEST-10-RAID-test.sh-add-rd.auto-1.patch b/0051-TEST-10-RAID-test.sh-add-rd.auto-1.patch
deleted file mode 100644
index 2bb6431..0000000
--- a/0051-TEST-10-RAID-test.sh-add-rd.auto-1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From bc070246244c91a12b4fdbd1a0b9d717ae32267e Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 24 Sep 2012 13:59:03 +0200
-Subject: [PATCH] TEST-10-RAID/test.sh: add "rd.auto=1"
-
----
- test/TEST-10-RAID/test.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
-index 92f4dd8..8e5b9e5 100755
---- a/test/TEST-10-RAID/test.sh
-+++ b/test/TEST-10-RAID/test.sh
-@@ -11,7 +11,7 @@ test_run() {
- 	-hda $DISKIMAGE \
- 	-m 256M -nographic \
- 	-net none -kernel /boot/vmlinuz-$KVERSION \
--	-append "root=/dev/dracut/root rw rd.retry=10 console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
-+	-append "root=/dev/dracut/root rd.auto=1 rw rd.retry=10 console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
-     grep -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
- }
diff --git a/0052-i18n-10-console.rules-do-the-console-init-only-one-t.patch b/0052-i18n-10-console.rules-do-the-console-init-only-one-t.patch
deleted file mode 100644
index 5929669..0000000
--- a/0052-i18n-10-console.rules-do-the-console-init-only-one-t.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From a0508937fc0d4fecf693301cca0ffe9e82ebb944 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 24 Sep 2012 15:12:20 +0200
-Subject: [PATCH] i18n/10-console.rules: do the console init only one time
-
----
- modules.d/10i18n/10-console.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/10i18n/10-console.rules b/modules.d/10i18n/10-console.rules
-index 385dff0..640b1db 100644
---- a/modules.d/10i18n/10-console.rules
-+++ b/modules.d/10i18n/10-console.rules
-@@ -1,2 +1,2 @@
- # Console initialization - keyboard, font, etc.
--KERNEL=="tty0",		RUN+="/sbin/initqueue --unique --name console_init_$name /lib/udev/console_init $root/$name"
-+KERNEL=="tty0",		RUN+="/sbin/initqueue --onetime --unique --name console_init_$name /lib/udev/console_init $root/$name"
diff --git a/0053-url-lib-module-setup.sh-also-install-libs-for-https.patch b/0053-url-lib-module-setup.sh-also-install-libs-for-https.patch
deleted file mode 100644
index 0f586d2..0000000
--- a/0053-url-lib-module-setup.sh-also-install-libs-for-https.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 17b01c5b13a0b33ad610c2e923c323f616ff7edc Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 26 Sep 2012 10:52:33 +0200
-Subject: [PATCH] url-lib/module-setup.sh: also install libs for https
-
----
- modules.d/45url-lib/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/modules.d/45url-lib/module-setup.sh b/modules.d/45url-lib/module-setup.sh
-index ad8f55e..0fb3667 100755
---- a/modules.d/45url-lib/module-setup.sh
-+++ b/modules.d/45url-lib/module-setup.sh
-@@ -14,6 +14,12 @@ depends() {
- install() {
-     inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh"
-     dracut_install curl
-+    # also install libs for curl https
-+    inst_libdir_file "libnsspem.so*"
-+    inst_libdir_file "libnsssysinit.so*"
-+    inst_libdir_file "libsoftokn3.so*"
-+    inst_libdir_file "libsqlite3.so*"
-+
-     mkdir -m 0755 -p "$initdir/etc/ssl/certs"
-     if ! inst_any -t /etc/ssl/certs/ca-bundle.crt \
-             /etc/ssl/certs/ca-bundle.crt \
diff --git a/0054-busybox-fix-installation-from-sbin-busybox.patch b/0054-busybox-fix-installation-from-sbin-busybox.patch
deleted file mode 100644
index 8952cee..0000000
--- a/0054-busybox-fix-installation-from-sbin-busybox.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 69eba8c40a5e34569ae67f8970cc72b28b8d8a72 Mon Sep 17 00:00:00 2001
-From: Daniel Drake <dsd@laptop.org>
-Date: Tue, 25 Sep 2012 18:42:28 -0400
-Subject: [PATCH] busybox: fix installation from /sbin/busybox
-
-"inst busybox" no longer seems to work when busybox is at
-/sbin/busybox. Reproduced on Fedora 18 (dracut-023-39.git20120910).
-
-Use type -P to find the full path to busybox to solve this problem.
----
- modules.d/05busybox/module-setup.sh | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/05busybox/module-setup.sh b/modules.d/05busybox/module-setup.sh
-index 2e9ead8..e0ef178 100755
---- a/modules.d/05busybox/module-setup.sh
-+++ b/modules.d/05busybox/module-setup.sh
-@@ -13,9 +13,10 @@ depends() {
- }
- 
- install() {
--    local _i _progs _path
--    inst busybox /usr/bin/busybox
--    for _i in `/sbin/busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}'`
-+    local _i _progs _path _busybox
-+    _busybox=$(type -P busybox)
-+    inst $_busybox /usr/bin/busybox
-+    for _i in `$_busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}'`
-     do
-         _progs="$_progs $_i"
-     done
diff --git a/0055-busybox-module-setup.sh-generate-nice-relative-symli.patch b/0055-busybox-module-setup.sh-generate-nice-relative-symli.patch
deleted file mode 100644
index e218cb6..0000000
--- a/0055-busybox-module-setup.sh-generate-nice-relative-symli.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2cae00be9ec7a9ba8538e24d53236a8baa34c93f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 26 Sep 2012 11:34:00 +0200
-Subject: [PATCH] busybox/module-setup.sh: generate nice relative symlinks
- with ln_r
-
----
- modules.d/05busybox/module-setup.sh | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/modules.d/05busybox/module-setup.sh b/modules.d/05busybox/module-setup.sh
-index e0ef178..edcc8da 100755
---- a/modules.d/05busybox/module-setup.sh
-+++ b/modules.d/05busybox/module-setup.sh
-@@ -16,7 +16,7 @@ install() {
-     local _i _progs _path _busybox
-     _busybox=$(type -P busybox)
-     inst $_busybox /usr/bin/busybox
--    for _i in `$_busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}'`
-+    for _i in $($_busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}')
-     do
-         _progs="$_progs $_i"
-     done
-@@ -27,11 +27,7 @@ install() {
-     for _i in $_progs; do
-         _path=$(find_binary "$_i")
-         [ -z "$_path" ] && continue
--        if [[ $_path != ${_path#/usr} ]]; then
--            ln -sf ../../usr/bin/busybox "$initdir/$_path"
--        else
--            ln -sf ../usr/bin/busybox "$initdir/$_path"
--        fi
-+        ln_r /usr/bin/busybox $_path
-     done
- }
- 
diff --git a/0056-install-dracut-install.c-support-find_binary-for-src.patch b/0056-install-dracut-install.c-support-find_binary-for-src.patch
deleted file mode 100644
index 040b2ef..0000000
--- a/0056-install-dracut-install.c-support-find_binary-for-src.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 868eba13f237dda70d98b00e754d6f337f6327b6 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 26 Sep 2012 11:34:38 +0200
-Subject: [PATCH] install/dracut-install.c: support find_binary for <src>
- <dst>
-
-also factor out find_binary()
----
- install/dracut-install.c | 127 +++++++++++++++++++++++++++++++----------------
- 1 file changed, 83 insertions(+), 44 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index f06f5ac..60a62e8 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -666,6 +666,81 @@ static int resolve_lazy(int argc, char **argv)
-         return ret;
- }
- 
-+static char *find_binary(const char *src)
-+{
-+        char *path;
-+        char *p, *q;
-+        bool end = false;
-+        char *newsrc = NULL;
-+        path = getenv("PATH");
-+
-+        if (path == NULL) {
-+                log_error("PATH is not set");
-+                exit(EXIT_FAILURE);
-+        }
-+        path = strdup(path);
-+        p = path;
-+        log_debug("PATH=%s", path);
-+
-+        do {
-+                struct stat sb;
-+
-+                for (q = p; *q && *q != ':'; q++) ;
-+
-+                if (*q == '\0')
-+                        end = true;
-+                else
-+                        *q = '\0';
-+
-+                asprintf(&newsrc, "%s/%s", p, src);
-+                p = q + 1;
-+
-+                if (stat(newsrc, &sb) != 0) {
-+                        log_debug("stat(%s) != 0", newsrc);
-+                        free(newsrc);
-+                        newsrc = NULL;
-+                        continue;
-+                }
-+
-+                end = true;
-+
-+        } while (!end);
-+
-+        free(path);
-+        if (newsrc)
-+                log_debug("find_binary(%s) == %s", src, newsrc);
-+        return newsrc;
-+}
-+
-+static int install_one(const char *src, const char *dst)
-+{
-+        int r = 0;
-+        int ret;
-+
-+        if (strchr(src, '/') == NULL) {
-+                char *newsrc = find_binary(src);
-+                if (newsrc) {
-+                        log_debug("dracut_install '%s' '%s'", newsrc, dst);
-+                        ret = dracut_install(newsrc, dst, arg_createdir, arg_resolvedeps, true);
-+                        if (ret == 0) {
-+                                log_debug("dracut_install '%s' '%s' OK", newsrc, dst);
-+                        }
-+                        free(newsrc);
-+                } else {
-+                        ret = -1;
-+                }
-+        } else {
-+                ret = dracut_install(src, dst, arg_createdir, arg_resolvedeps, true);
-+        }
-+
-+        if ((ret != 0) && (!arg_optional)) {
-+                log_error("ERROR: installing '%s' to '%s'", src, dst);
-+                r = EXIT_FAILURE;
-+        }
-+
-+        return r;
-+}
-+
- static int install_all(int argc, char **argv)
- {
-         int r = 0;
-@@ -675,50 +750,18 @@ static int install_all(int argc, char **argv)
-                 log_debug("Handle '%s'", argv[i]);
- 
-                 if (strchr(argv[i], '/') == NULL) {
--                        char *path;
--                        char *p, *q;
--                        bool end = false;
--                        path = getenv("PATH");
--                        if (path == NULL) {
--                                log_error("PATH is not set");
--                                exit(EXIT_FAILURE);
--                        }
--                        path = strdup(path);
--                        p = path;
--                        log_debug("PATH=%s", path);
--                        do {
--                                char *newsrc = NULL;
--                                char *dest;
--                                struct stat sb;
--
--                                for (q = p; *q && *q != ':'; q++) ;
--
--                                if (*q == '\0')
--                                        end = true;
--                                else
--                                        *q = '\0';
--
--                                asprintf(&newsrc, "%s/%s", p, argv[i]);
--                                p = q + 1;
--
--                                if (stat(newsrc, &sb) != 0) {
--                                        free(newsrc);
--                                        ret = -1;
--                                        continue;
--                                }
--
--                                dest = strdup(newsrc);
--
-+                        char *newsrc = find_binary(argv[i]);
-+                        if (newsrc) {
-                                 log_debug("dracut_install '%s'", newsrc);
--                                ret = dracut_install(newsrc, dest, arg_createdir, arg_resolvedeps, true);
-+                                ret = dracut_install(newsrc, newsrc, arg_createdir, arg_resolvedeps, true);
-                                 if (ret == 0) {
--                                        end = true;
-                                         log_debug("dracut_install '%s' OK", newsrc);
-                                 }
-                                 free(newsrc);
--                                free(dest);
--                        } while (!end);
--                        free(path);
-+                        } else {
-+                                ret = -1;
-+                        }
-+
-                 } else {
-                         char *dest = strdup(argv[i]);
-                         ret = dracut_install(argv[i], dest, arg_createdir, arg_resolvedeps, true);
-@@ -805,11 +848,7 @@ int main(int argc, char **argv)
-                 r = install_all(argc - optind, &argv[optind]);
-         } else {
-                 /* simple "inst src dst" */
--                r = dracut_install(argv[optind], argv[optind + 1], arg_createdir, arg_resolvedeps, true);
--                if ((r != 0) && (!arg_optional)) {
--                        log_error("ERROR: installing '%s' to '%s'", argv[optind], argv[optind + 1]);
--                        r = EXIT_FAILURE;
--                }
-+                r = install_one(argv[optind], argv[optind + 1]);
-         }
- 
-         if (arg_optional)
diff --git a/0057-dracut.cmdline.7.asc-fixed-rd.luks.allow-discards-fo.patch b/0057-dracut.cmdline.7.asc-fixed-rd.luks.allow-discards-fo.patch
deleted file mode 100644
index c0c2fda..0000000
--- a/0057-dracut.cmdline.7.asc-fixed-rd.luks.allow-discards-fo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f7235c223dcdfdfa345ed63c156165840e66b068 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 26 Sep 2012 11:48:41 +0200
-Subject: [PATCH] dracut.cmdline.7.asc: fixed rd.luks.allow-discards format
-
----
- dracut.cmdline.7.asc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
-index c376d79..910006d 100644
---- a/dracut.cmdline.7.asc
-+++ b/dracut.cmdline.7.asc
-@@ -219,7 +219,7 @@ crypto LUKS
-     LUKS UUID, so you don't have to specify the full UUID.
-     This parameter can be specified multiple times.
- 
--**rd.luks.allow-discards::
-+**rd.luks.allow-discards**::
-     Allow  using  of discards (TRIM) requests on all LUKS partitions.
- 
- **rd.luks.crypttab=0**::
diff --git a/0058-crypt-crypt-run-generator.sh-add-allow-discards-to-o.patch b/0058-crypt-crypt-run-generator.sh-add-allow-discards-to-o.patch
deleted file mode 100644
index b95d8b4..0000000
--- a/0058-crypt-crypt-run-generator.sh-add-allow-discards-to-o.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 372202007163a3294f3198dfb0eb9882e89b6e0e Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 26 Sep 2012 11:49:28 +0200
-Subject: [PATCH] crypt/crypt-run-generator.sh: add allow-discards to options
- in crypttab
-
----
- modules.d/90crypt/crypt-run-generator.sh | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh
-index 224e511..3264b29 100755
---- a/modules.d/90crypt/crypt-run-generator.sh
-+++ b/modules.d/90crypt/crypt-run-generator.sh
-@@ -11,7 +11,18 @@ if [ -f /etc/crypttab ]; then
-     done < /etc/crypttab
- fi
- 
--echo "$luks $dev" >> /etc/crypttab
-+# parse for allow-discards
-+if strstr "$(cryptsetup --help)" "allow-discards"; then
-+    if discarduuids=$(getargs "rd.luks.allow-discards"); then
-+        if strstr " $discarduuids " " ${luks##luks-}"; then
-+	    allowdiscards="allow-discards"
-+	fi
-+    elif getargbool rd.luks.allow-discards; then
-+	allowdiscards="allow-discards"
-+    fi
-+fi
-+
-+echo "$luks $dev none $allowdiscards" >> /etc/crypttab
- systemctl daemon-reload
- systemctl start cryptsetup.target
- exit 0
diff --git a/0059-TEST-16-DMSQUASH-reenable-test.patch b/0059-TEST-16-DMSQUASH-reenable-test.patch
deleted file mode 100644
index 013ba81..0000000
--- a/0059-TEST-16-DMSQUASH-reenable-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7f1d77d9fb27f678f50aa6ad1baac7d28e8e4f5f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 26 Sep 2012 11:58:51 +0200
-Subject: [PATCH] TEST-16-DMSQUASH: reenable test
-
----
- test/TEST-16-DMSQUASH/test.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
-index 4dc133c..9c4f356 100755
---- a/test/TEST-16-DMSQUASH/test.sh
-+++ b/test/TEST-16-DMSQUASH/test.sh
-@@ -11,7 +11,7 @@ test_check() {
-         echo "python-imgcreate not installed"
- 	return 1
-     fi
--    return 1
-+    return 0
- }
- 
- test_run() {
diff --git a/0060-dm-module-setup.sh-instmods-dm_mod.patch b/0060-dm-module-setup.sh-instmods-dm_mod.patch
deleted file mode 100644
index 4d32996..0000000
--- a/0060-dm-module-setup.sh-instmods-dm_mod.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 194e074764756a2ee4d7164aa422dddae51b3576 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 26 Sep 2012 15:05:34 +0200
-Subject: [PATCH] dm/module-setup.sh: instmods dm_mod
-
----
- modules.d/90dm/module-setup.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh
-index 8bc2ea4..6ec9af4 100755
---- a/modules.d/90dm/module-setup.sh
-+++ b/modules.d/90dm/module-setup.sh
-@@ -13,6 +13,7 @@ depends() {
- 
- installkernel() {
-     instmods =drivers/md
-+    instmods dm_mod
- }
- 
- install() {
diff --git a/0061-dracut.sh-create-the-initramfs-non-world-readable.patch b/0061-dracut.sh-create-the-initramfs-non-world-readable.patch
deleted file mode 100644
index 0354d86..0000000
--- a/0061-dracut.sh-create-the-initramfs-non-world-readable.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e1b48995c26c4f06d1a718539cb1bd5b0179af91 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 27 Sep 2012 10:18:29 +0200
-Subject: [PATCH] dracut.sh: create the initramfs non-world readable
-
----
- dracut.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 7148d0f..96faa06 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1033,8 +1033,9 @@ if [[ $do_hardlink = yes ]] ; then
-     }
- fi
- 
-+rm -f "$outfile"
- dinfo "*** Creating image file ***"
--if ! ( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \
-+if ! ( umask 077; cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \
-     $compress > "$outfile"; ); then
-     dfatal "dracut: creation of $outfile failed"
-     exit 1
diff --git a/0062-network-ifup.sh-setup-nameserver-for-every-interface.patch b/0062-network-ifup.sh-setup-nameserver-for-every-interface.patch
deleted file mode 100644
index 4963521..0000000
--- a/0062-network-ifup.sh-setup-nameserver-for-every-interface.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a0be1eddcf8cfc74d3475965f4bba351653870a8 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 27 Sep 2012 11:52:27 +0200
-Subject: [PATCH] network/ifup.sh: setup nameserver for every interface
-
-even for dhcp
-
-https://bugzilla.redhat.com/show_bug.cgi?id=840769
----
- modules.d/40network/ifup.sh | 22 ++++++++--------------
- 1 file changed, 8 insertions(+), 14 deletions(-)
-
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 316a21a..95289c9 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -88,13 +88,6 @@ do_ipv6auto() {
-     wait_for_if_up $netif
- 
-     [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
--
--    namesrv=$(getargs nameserver)
--    if  [ -n "$namesrv" ] ; then
--        for s in $namesrv; do
--            echo nameserver $s
--        done
--    fi >> /tmp/net.$netif.resolv.conf
- }
- 
- # Handle static ip configuration
-@@ -115,13 +108,6 @@ do_static() {
- 
-     [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
-     [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
--
--    namesrv=$(getargs nameserver)
--    if  [ -n "$namesrv" ] ; then
--        for s in $namesrv; do
--            echo nameserver $s
--        done
--    fi >> /tmp/net.$netif.resolv.conf
- }
- 
- # loopback is always handled the same way
-@@ -220,6 +206,14 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
-     ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname; echo $?)"
- fi
- 
-+# setup nameserver
-+namesrv=$(getargs nameserver)
-+if  [ -n "$namesrv" ] ; then
-+    for s in $namesrv; do
-+        echo nameserver $s
-+    done
-+fi >> /tmp/net.$netif.resolv.conf
-+
- # No ip lines default to dhcp
- ip=$(getarg ip)
- 
diff --git a/0063-shutdown-shutdown.sh-reboot-if-no-argument-was-given.patch b/0063-shutdown-shutdown.sh-reboot-if-no-argument-was-given.patch
deleted file mode 100644
index 2d375a0..0000000
--- a/0063-shutdown-shutdown.sh-reboot-if-no-argument-was-given.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d65638dacb57aaa681f05b63b3ea49cef9f80d2f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 27 Sep 2012 12:10:14 +0200
-Subject: [PATCH] shutdown/shutdown.sh: reboot, if no argument was given
-
----
- modules.d/99shutdown/shutdown.sh | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
-index e1da91b..74b6be8 100755
---- a/modules.d/99shutdown/shutdown.sh
-+++ b/modules.d/99shutdown/shutdown.sh
-@@ -6,6 +6,7 @@
- #
- # Copyright 2011, Red Hat, Inc.
- # Harald Hoyer <harald@redhat.com>
-+ACTION="$1"
- 
- export TERM=linux
- export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-@@ -40,8 +41,8 @@ _check_shutdown() {
-     local __s=1
-     for __f in $hookdir/shutdown/*.sh; do
-         [ -e "$__f" ] || continue
--        ( . "$__f" $1 ) 
--        if [ $? -eq 0 ]; then 
-+        ( . "$__f" $1 )
-+        if [ $? -eq 0 ]; then
-             rm -f $__f
-             __s=0
-         fi
-@@ -49,14 +50,16 @@ _check_shutdown() {
-     return $__s
- }
- 
--_cnt=0
- while _check_shutdown; do
- :
- done
- _check_shutdown final
- 
- getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown"
--[ "$1" = "reboot" ] && reboot -f -d -n
--[ "$1" = "poweroff" ] && poweroff -f -d -n
--[ "$1" = "halt" ] && halt -f -d -n
--[ "$1" = "kexec" ] && kexec -e
-+[ "$ACTION" = "reboot" ] && reboot -f -d -n
-+[ "$ACTION" = "poweroff" ] && poweroff -f -d -n
-+[ "$ACTION" = "halt" ] && halt -f -d -n
-+[ "$ACTION" = "kexec" ] && kexec -e
-+
-+warn "Shutdown called without an argument. Rebooting!"
-+reboot -f -d -n
diff --git a/0064-TODO-update.patch b/0064-TODO-update.patch
deleted file mode 100644
index 2c2c85b..0000000
--- a/0064-TODO-update.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 69ba546721d9faee2a29498df4c6ec6676a30c5c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 27 Sep 2012 12:28:46 +0200
-Subject: [PATCH] TODO: update
-
----
- TODO | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/TODO b/TODO
-index 9481df7..84939ab 100644
---- a/TODO
-+++ b/TODO
-@@ -14,6 +14,13 @@ INITRAMFS TODO
- - put mount hook in main initqueue loop / careful about resume!
- - the hard-coded list of udev rules that we care about is kind of lame.
- - panic fallback
-+- bridging/bonding without "netroot=" https://bugzilla.redhat.com/show_bug.cgi?id=822750
-+- progress indication for fsck https://bugzilla.redhat.com/show_bug.cgi?id=827118
-+- domain, searchdomain https://bugzilla.redhat.com/show_bug.cgi?id=840778
-+- disable write-ifcfg https://bugzilla.redhat.com/show_bug.cgi?id=840784
-+- check for /var to be mounted in convertfs https://bugzilla.redhat.com/show_bug.cgi?id=848172
-+- probably fix "--include" https://bugzilla.redhat.com/show_bug.cgi?id=849338
-+- iscsi livecd boot
- 
- GENERATOR TODO
-