[lorax v2] Let the plymouth dracut module back into the ppc64 upgrade.img

David Shea dshea at redhat.com
Thu Sep 11 21:19:11 UTC 2014


The 32MiB size limit does not apply to upgrade.img since it's installed
to /boot by redhat-upgrade-tool instead of downloaded through TFTP. The
warning in rebuild_initrds will still be triggered by an upgrade.img
over the limit, but this doesn't halt the compose and it's probably not
a bad thing to know about.

Resolves: rhbz#1069671
---
 src/pylorax/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py
index ea51718..2c4f701 100644
--- a/src/pylorax/__init__.py
+++ b/src/pylorax/__init__.py
@@ -297,13 +297,16 @@ class Lorax(BaseLoraxClass):
 
         logger.info("rebuilding initramfs images")
         dracut_args = ["--xz", "--install", "/.buildstamp"]
+        anaconda_args = dracut_args + ["--add", "anaconda pollcdrom"]
 
         # ppc64 cannot boot an initrd > 32MiB so remove some drivers
         if self.arch.basearch in ("ppc64", "ppc64le"):
             dracut_args.extend(["--omit-drivers", REMOVE_PPC64_DRIVERS])
-            dracut_args.extend(["--omit", REMOVE_PPC64_MODULES])
 
-        anaconda_args = dracut_args + ["--add", "anaconda pollcdrom"]
+            # Only omit dracut modules from the initrd so that they're kept for
+            # upgrade.img
+            anaconda_args.extend(["--omit", REMOVE_PPC64_MODULES])
+
         treebuilder.rebuild_initrds(add_args=anaconda_args)
 
         if doupgrade:
-- 
2.1.0



More information about the anaconda-patches mailing list