[PATCH rhel6-branch 4/4] Don't force installation of authconfig, chkconfig, or system-config-firewall.

Chris Lumens clumens at redhat.com
Mon Aug 4 15:12:33 UTC 2014


The first and last if they don't exist will only log an error message, not cause
anaconda to terminate.  chkconfig is a little tougher to skip, but still
doable.  This should really only affect people doing kickstart installs with
the --nocore option.

Resolves: rhbz#1123481
---
 yuminstall.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/yuminstall.py b/yuminstall.py
index 99cc78e..2d72a6a 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1594,13 +1594,12 @@ debuglevel=6
                 fspkgs.add(pkg)
         map(self.selectPackage, fspkgs)
 
-    # anaconda requires several programs on the installed system to complete
-    # installation, but we have no guarantees that some of these will be
-    # installed (they could have been removed in kickstart).  So we'll force
-    # it.
-    def selectAnacondaNeeds(self):
-        for pkg in ['authconfig', 'chkconfig', 'system-config-firewall-base']:
-            self.selectPackage(pkg)
+    def selectAnacondaNeeds(self, anaconda):
+        # Only add in chkconfig if they did something that needs it.
+        if anaconda.isKickstart and (anaconda.id.ksdata.services.disabled or
+                                     anaconda.id.ksdata.services.enabled) or \
+           anaconda.id.storage.services or anaconda.id.network.hasActiveIPoIBDevice():
+            self.selectPackage("chkconfig")
 
     def doPostSelection(self, anaconda):
         # Only solve dependencies on the way through the installer, not the way back.
@@ -1618,7 +1617,7 @@ debuglevel=6
             self.selectFSPackages(anaconda.id.storage)
             if anaconda.id.network.hasActiveIPoIBDevice():
                 self.selectPackage("rdma")
-            self.selectAnacondaNeeds()
+            self.selectAnacondaNeeds(anaconda)
         else:
             self.ayum.update()
 
-- 
1.9.3



More information about the anaconda-patches mailing list