--- anaconda | 3 ++- pyanaconda/kickstart.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/anaconda b/anaconda index cc02a5c..17bf3af 100755 --- a/anaconda +++ b/anaconda @@ -829,7 +829,8 @@ if __name__ == "__main__": break
if not ksdata: - ksdata = kickstart.AnacondaKSHandler(constants.ADDON_PATHS) + addon_paths = collect_addon_paths(constants.ADDON_PATHS) + ksdata = kickstart.AnacondaKSHandler(addon_paths["ks"])
if ksdata.rescue.rescue: anaconda.rescue = True diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 0e44eee..65a1e55 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -53,7 +53,7 @@ from pyanaconda.simpleconfig import SimpleConfigFile from pyanaconda.users import getPassAlgo from pyanaconda.desktop import Desktop from .ui.common import collect -from .addons import AddonSection, AddonData, AddonRegistry +from .addons import AddonSection, AddonData, AddonRegistry, collect_addon_paths
from pykickstart.base import KickstartCommand from pykickstart.constants import * @@ -1438,7 +1438,8 @@ def preScriptPass(f): def parseKickstart(f): # preprocessing the kickstart file has already been handled in initramfs.
- handler = AnacondaKSHandler(ADDON_PATHS) + addon_paths = collect_addon_paths(ADDON_PATHS) + handler = AnacondaKSHandler(addon_paths["ks"]) ksparser = AnacondaKSParser(handler)
# We need this so all the /dev/disk/* stuff is set up before parsing.