From d34acfc14c44831d6b61d5173ba07cab5fbe45b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Wed, 2 Jan 2019 09:52:49 +0100
Subject: [PATCH] don't reduce initrd size on ppc64/ppc64le

---
 src/pylorax/__init__.py    | 12 ------------
 src/pylorax/treebuilder.py |  6 ------
 2 files changed, 18 deletions(-)

diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py
index e8df20ab..3d7a553a 100644
--- a/src/pylorax/__init__.py
+++ b/src/pylorax/__init__.py
@@ -60,10 +60,6 @@ else:
 
 DRACUT_DEFAULT = ["--xz", "--install", "/.buildstamp", "--no-early-microcode", "--add", "fips"]
 
-# List of drivers to remove on ppc64 arch to keep initrd < 32MiB
-REMOVE_PPC64_DRIVERS = "floppy scsi_debug nouveau radeon cirrus mgag200"
-REMOVE_PPC64_MODULES = "drm plymouth"
-
 # Used for DNF conf.module_platform_id
 DEFAULT_PLATFORM_ID = "platform:f30"
 
@@ -351,14 +347,6 @@ class Lorax(BaseLoraxClass):
 
         anaconda_args = dracut_args + ["--add", "anaconda pollcdrom qemu qemu-net"]
 
-        # 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])
-
-            # Only omit dracut modules from the initrd so that they're kept for
-            # upgrade.img
-            anaconda_args.extend(["--omit", REMOVE_PPC64_MODULES])
-
         logger.info("dracut args = %s", dracut_args)
         logger.info("anaconda args = %s", anaconda_args)
         treebuilder.rebuild_initrds(add_args=anaconda_args)
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index 0fce0b83..b1e277ac 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -306,12 +306,6 @@ class TreeBuilder(object):
             cmd = dracut + [outfile, kernel.version]
             runcmd(cmd, root=self.vars.inroot)
 
-            # ppc64 cannot boot images > 32MiB, check size and warn
-            if self.vars.arch.basearch in ("ppc64", "ppc64le") and os.path.exists(outfile):
-                st = os.stat(outfile)
-                if st.st_size > 32 * 1024 * 1024:
-                    logging.warning("ppc64 initrd %s is > 32MiB", outfile)
-
         os.unlink(joinpaths(self.vars.inroot,"/proc/modules"))
 
     def build(self):