[PATCH 1/2] Don't create the configured.ini file (#1119166)

Martin Kolman mkolman at redhat.com
Tue Jul 15 12:54:37 UTC 2014


This apparently was a remnant from the early Initial Setup development,
before it was decided that Initial Setup will just read the kickstart
created by Anaconda. The resulting configuration file is always empty
and never read by anything, so the code can be safely removed.

Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
 pyanaconda/install.py   |  1 -
 pyanaconda/kickstart.py | 26 --------------------------
 2 files changed, 27 deletions(-)

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index f136384..d1097df 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -99,7 +99,6 @@ def doConfiguration(storage, payload, ksdata, instClass):
 
     with progress_report(_("Configuring addons")):
         ksdata.addons.execute(storage, ksdata, instClass, u)
-        ksdata.configured_spokes.execute(storage, ksdata, instClass, u)
 
     with progress_report(_("Generating initramfs")):
         payload.recreateInitrds(force=True)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index d5cefff..09f2a88 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1674,29 +1674,6 @@ class Upgrade(commands.upgrade.F20_Upgrade):
         sys.stderr.write(_("The upgrade kickstart command is no longer supported. Upgrade functionality is provided through fedup."))
         sys.exit(1)
 
-class SpokeRegistry(dict):
-    """This class represents the ksdata.firstboot object and
-       maintains the ids of all user configured spokes.
-
-       The information is then used by inital_setup and GIE
-       to hide already configured spokes.
-    """
-
-    def __str__(self):
-        # do not write anything into kickstart
-        return ""
-
-    def execute(self, storage, ksdata, instClass, users):
-        path = os.path.join(iutil.getSysroot(), "var", "lib", "inital-setup")
-        try:
-            os.makedirs(path, 0o755)
-        except OSError:
-            pass
-        f = open(os.path.join(path, "configured.ini"), "a")
-        for k,v in self.iteritems():
-            f.write("%s=%s\n" % (k, v))
-        f.close()
-
 ###
 ### HANDLERS
 ###
@@ -1785,9 +1762,6 @@ class AnacondaKSHandler(superclass):
             if classes:
                 addons[addon_id] = classes[0](name = addon_id)
 
-        # Prepare the structure to track configured spokes
-        self.configured_spokes = SpokeRegistry()
-
         # Prepare the final structures for 3rd party addons
         self.addons = AddonRegistry(addons)
 
-- 
1.9.3



More information about the anaconda-patches mailing list