[rhel6-branch] Exclude prelink package in FIPS mode (#697938)

Brian C. Lane bcl at redhat.com
Tue Feb 24 17:00:31 UTC 2015


In fips mode prelinking needs to be disabled.

Resolves: rhbz#697938
---
 platform.py   | 15 ++++++++++++---
 yuminstall.py |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/platform.py b/platform.py
index 59a782c..53412c3 100644
--- a/platform.py
+++ b/platform.py
@@ -44,6 +44,7 @@ class Platform(object):
     _isEfi = iutil.isEfi()
     _minimumSector = 0
     _packages = []
+    _excluded_packages = []
     _supportsLvmBoot = False
     _supportsMdRaidBoot = False
     _minBootPartSize = 50
@@ -190,11 +191,19 @@ class Platform(object):
     @property
     def packages (self):
         if self.anaconda.isKickstart and self.anaconda.id.ksdata.bootloader.disabled:
-            return []
+            packages = []
+        else:
+            packages = self._packages
+
+        if flags.cmdline.get('fips', None) == '1':
+            packages += ['dracut-fips']
+        return packages
 
+    @property
+    def excluded_packages (self):
         if flags.cmdline.get('fips', None) == '1':
-            return self._packages + ['dracut-fips']
-        return self._packages
+            return self._excluded_packages + ['prelink']
+        return self._excluded_packages
 
     def setDefaultPartitioning(self):
         """Return the default platform-specific partitioning information."""
diff --git a/yuminstall.py b/yuminstall.py
index 2d72a6a..da35677 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1614,6 +1614,7 @@ debuglevel=6
             # New installs only - upgrades will already have all this stuff.
             self.selectBestKernel(anaconda)
             map(self.selectPackage, anaconda.platform.packages)
+            map(self.deselectPackage, anaconda.platform.excluded_packages)
             self.selectFSPackages(anaconda.id.storage)
             if anaconda.id.network.hasActiveIPoIBDevice():
                 self.selectPackage("rdma")
-- 
2.1.0



More information about the anaconda-patches mailing list