From ef84a6c944b5a877e5d268845f08ad01f4859790 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 4 May 2014 22:54:28 +0000 Subject: [PATCH 05/20] main: Set flags.extlinux if extlinux is used in interactive-defaults.ks For making a custom Project Atomic boot ISO, I tried adding "bootloader --extlinux" to /usr/share/anaconda/interactive-defaults.ks. Confusingly this doesn't work because extlinux is a flag, and not just a kickstart variable; the flag is set by the dracut KS parser. (Does extlinux really need to be a flag?) This small patch just ensures the flag is set if the KS enables extlinux. Note: I left a log.info in there since it seems useful to log when we're parsing a KS file, but feel free to remove it. Resolves: rhbz#1113535 Port of rpmostreepayload patches from master commit f4921edf42d57523e8b42ba21d79e78a47d88e8b --- anaconda | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anaconda b/anaconda index 2a802a3..0cd031f 100755 --- a/anaconda +++ b/anaconda @@ -903,6 +903,7 @@ if __name__ == "__main__": continue kickstart.preScriptPass(f) + log.info("Parsing kickstart: " + f) ksdata = kickstart.parseKickstart(f) # Only load the first defaults file we find. @@ -911,6 +912,10 @@ if __name__ == "__main__": if not ksdata: ksdata = kickstart.AnacondaKSHandler(addon_paths["ks"]) + # Pick up any changes from interactive-defaults.ks that would + # otherwise be covered by the dracut KS parser. + if ksdata.bootloader.extlinux: + flags.extlinux = True if ksdata.rescue.rescue: anaconda.rescue = True -- 1.9.3