[LORAX-f17-branch 3/4] add anaconda dracut module

["Brian C. Lane" <bcl@xxxxxxxxxx>]

From: Will Woods <wwoods@xxxxxxxxxx>

Install the anaconda dracut module during 'install', use it when
rebuilding initramfs, and clean it up afterward.
---
 share/runtime-cleanup.tmpl |    2 +-
 share/runtime-install.tmpl |    4 +++-
 src/pylorax/__init__.py    |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 45bcca4..e211cf2 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -21,7 +21,7 @@ removepkg plymouth*
 removefrom ${product.name}-logos /usr/share/plymouth/*
 ## we don't create new initramfs/bootloader conf inside anaconda
 ## (that happens inside the target system after we install dracut/grubby)
-removepkg dracut-network grubby
+removepkg dracut-network grubby anaconda-dracut
 ## In order to execute the /usr move on upgrades we need convertfs from dracut
 removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh
 ## we don't run SELinux (not in enforcing, anyway)
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 503a53b..1776fd7 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -33,10 +33,12 @@ installpkg kernel
 %endif
 
 ## extra dracut modules
-installpkg dracut-network
+installpkg dracut-network anaconda-dracut
 
 ## required for dracut
 installpkg kbd kbd-misc
+## required for anaconda-dracut (img-lib etc.)
+installpkg tar xz dmidecode curl
 
 ## basic system stuff
 installpkg systemd-sysv systemd-units
diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py
index 758d656..a38f9f2 100644
--- a/src/pylorax/__init__.py
+++ b/src/pylorax/__init__.py
@@ -248,7 +248,7 @@ class Lorax(BaseLoraxClass):
                                   templatedir=templatedir)
 
         logger.info("rebuilding initramfs images")
-        dracut_args=["--xz", "--add", "livenet", "--add", "convertfs", "--omit", "plymouth"]
+        dracut_args=["--xz", "--add", "anaconda", "--omit", "plymouth"]
         treebuilder.rebuild_initrds(add_args=dracut_args)
 
         logger.info("populating output tree and building boot images")
-- 
1.7.7.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list