From 22a36d3a81190c015cd82ec2ea8269b6abe0dec5 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Tue, 30 Jul 2013 14:47:16 +0200
Subject: [PATCH] dracut-nohostonly and dracut-norescue got renamed for dracut
 >= 030 (#990305)

---
 README.livemedia-creator     | 3 ++-
 docs/fedora-livemedia-ec2.ks | 2 +-
 docs/fedora-livemedia.ks     | 2 +-
 lorax.spec                   | 1 +
 share/runtime-cleanup.tmpl   | 3 ++-
 share/runtime-install.tmpl   | 2 +-
 src/sbin/livemedia-creator   | 5 +++--
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.livemedia-creator b/README.livemedia-creator
index 55f12c1e..76280a13 100644
--- a/README.livemedia-creator
+++ b/README.livemedia-creator
@@ -111,7 +111,8 @@ passwd -d root > /dev/null
 cat /dev/null > /dev/fstab
 
 11. Don't delete initramfs files from /boot in %post
-12. Have dracut-norescue, grub-efi, memtest86+ and syslinux in the package list
+12. Have grub-efi, memtest86+ and syslinux in the package list
+13. Omit dracut-config-rescue from the package list "-dracut-config-rescue"
 
 One drawback to using virt-install is that it pulls the packages from
 the repo each time you run it. To speed things up you either need a local
diff --git a/docs/fedora-livemedia-ec2.ks b/docs/fedora-livemedia-ec2.ks
index 3778b5a1..79ec1bcc 100644
--- a/docs/fedora-livemedia-ec2.ks
+++ b/docs/fedora-livemedia-ec2.ks
@@ -64,7 +64,7 @@ iputils
 cloud-init
 
 grub
-dracut-norescue
+-dracut-config-rescue
 %end
 
 # more ec2-ify
diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks
index 9aa9ad32..6d59a229 100644
--- a/docs/fedora-livemedia.ks
+++ b/docs/fedora-livemedia.ks
@@ -386,5 +386,5 @@ grub2-efi
 grub2
 shim
 syslinux
-dracut-norescue
+-dracut-config-rescue
 %end
diff --git a/lorax.spec b/lorax.spec
index 8bf994b1..56459865 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -34,6 +34,7 @@ Requires:       util-linux
 Requires:       xz
 Requires:       yum
 Requires:       pykickstart
+Requires:       dracut >= 030
 
 %if 0%{?fedora}
 # Fedora specific deps
diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 626e7b49..423d1a2b 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -23,7 +23,8 @@ removefrom ${product.name}-logos /usr/share/plymouth/*
 ## We also need dracut-shutdown.service and dracut-initramfs-restore to reboot
 removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \
                   /usr/lib/dracut/modules.d/99base/dracut-lib.sh \
-                  /usr/lib/systemd/* /usr/lib/dracut/dracut-initramfs-restore
+                  /usr/lib/systemd/* /usr/lib/dracut/modules.d/98systemd/*.service \
+                  /usr/lib/dracut/dracut-initramfs-restore
 ## we don't run SELinux (not in enforcing, anyway)
 removepkg checkpolicy selinux-policy libselinux-utils
 ## anaconda has its own repo files
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 7db05389..3458cdc9 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -43,7 +43,7 @@ installpkg kernel
 installpkg plymouth
 
 ## extra dracut modules
-installpkg anaconda-dracut dracut-network dracut-nohostonly dracut-norescue
+installpkg anaconda-dracut dracut-network dracut-config-generic
 
 ## fedup-dracut handles upgrades
 installpkg fedup-dracut fedup-dracut-plymouth
diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator
index e4f2423d..a0a994b4 100755
--- a/src/sbin/livemedia-creator
+++ b/src/sbin/livemedia-creator
@@ -364,8 +364,9 @@ class KernelInfo(object):
         Examine the vmlinuz-* versions and return a list of them
 
         Ignore any with -rescue- in them, these are dracut rescue images.
-        The user shoud add dracut-norescue package to the kickstart to remove them,
-        but catch it here as well.
+        The user shoud add
+        -dracut-config-rescue
+        to the kickstart to remove them, but catch it here as well.
         """
         files = os.listdir(self.boot_dir)
         return [f[8:] for f in files if f.startswith("vmlinuz-") \