51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
From 6995fc0923d61bd4d42380a34aefc17e4e94f13a Mon Sep 17 00:00:00 2001
|
|
From: wang--ge <wang__ge@126.com>
|
|
Date: Tue, 30 May 2023 09:34:35 +0800
|
|
Subject: [PATCH] Remove deprecated support for add-ons
|
|
|
|
---
|
|
initial_setup/__init__.py | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/initial_setup/__init__.py b/initial_setup/__init__.py
|
|
index a418cbe..5273a91 100644
|
|
--- a/initial_setup/__init__.py
|
|
+++ b/initial_setup/__init__.py
|
|
@@ -125,14 +125,14 @@ class InitialSetup(object):
|
|
gi.overrides.__path__.insert(0, p)
|
|
log.debug("GI overrides imported")
|
|
|
|
- from pyanaconda.addons import collect_addon_paths
|
|
+ from pyanaconda.ui.lib.addons import collect_addon_ui_paths
|
|
|
|
addon_paths = ["/usr/share/initial-setup/modules", "/usr/share/anaconda/addons"]
|
|
|
|
# append ADDON_PATHS dirs at the end
|
|
sys.path.extend(addon_paths)
|
|
|
|
- self._addon_module_paths = collect_addon_paths(addon_paths, self.gui_mode_id)
|
|
+ self._addon_module_paths = collect_addon_ui_paths(addon_paths, self.gui_mode_id)
|
|
log.info("found %d addon modules:", len(self._addon_module_paths))
|
|
for addon_path in self._addon_module_paths:
|
|
log.debug(addon_path)
|
|
@@ -202,7 +202,7 @@ class InitialSetup(object):
|
|
commandMap = dict((k, kickstart.commandMap[k]) for k in SUPPORTED_KICKSTART_COMMANDS)
|
|
|
|
# Prepare new data object
|
|
- self.data = kickstart.AnacondaKSHandler(self._addon_module_paths["ks"], commandUpdates=commandMap)
|
|
+ self.data = kickstart.AnacondaKSHandler(commandUpdates=commandMap)
|
|
|
|
kickstart_path = INPUT_KICKSTART_PATH
|
|
if os.path.exists(OUTPUT_KICKSTART_PATH):
|
|
@@ -329,7 +329,6 @@ class InitialSetup(object):
|
|
|
|
# Configure all addons
|
|
log.info("executing addons")
|
|
- self.data.addons.execute(storage=None, ksdata=self.data, users=None, payload=None)
|
|
|
|
boss_proxy = BOSS.get_proxy()
|
|
task_path = boss_proxy.InstallSystemWithTask()
|
|
--
|
|
2.33.0
|
|
|