[PATCH 2/3] Read the kickstart from previous IS if available (#1110439)

Martin Kolman mkolman at redhat.com
Wed Jul 1 12:01:55 UTC 2015


If there is a kickstart from a previous IS run use it instead of the
Anaconda generated one. Otherwise changes done in Initial Setup
(such as accepting the EULA) will not be visible in subsequent IS runs.

Related: rhbz#1110439
Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
 initial_setup/__main__.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/initial_setup/__main__.py b/initial_setup/__main__.py
index 120ae0c..5e80f9b 100644
--- a/initial_setup/__main__.py
+++ b/initial_setup/__main__.py
@@ -91,11 +91,16 @@ commandMap = dict((k, kickstart.commandMap[k]) for k in kickstart_commands)
 # Prepare new data object
 data = kickstart.AnacondaKSHandler(addon_module_paths["ks"], commandUpdates=commandMap)
 
-log.info("parsing input kickstart %s", INPUT_KICKSTART_PATH)
+kickstart_path = INPUT_KICKSTART_PATH
+if os.path.exists(OUTPUT_KICKSTART_PATH):
+    log.info("using kickstart from previous run for input")
+    kickstart_path = OUTPUT_KICKSTART_PATH
+
+log.info("parsing input kickstart %s", kickstart_path)
 try:
     # Read the installed kickstart
     parser = kickstart.AnacondaKSParser(data)
-    parser.readKickstart(INPUT_KICKSTART_PATH)
+    parser.readKickstart(kickstart_path)
     log.info("kickstart parsing done")
 except pykickstart.errors.KickstartError as kserr:
     log.exception("kickstart parsing failed: %s" % kserr)
-- 
2.4.3



More information about the anaconda-patches mailing list