From 000d48992bc7b9bfc8956f5393dcc83d0126a801 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sat, 29 Jun 2019 10:55:32 +0800 Subject: [PATCH] kickstart: not support Authselect/Firewall/Firstboot We do not support kickstart for now Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia Refactor for version anaconda 34. Signed-off-by: Kai Kang Rebase for anaconda 37. Signed-off-by: Kai Kang --- anaconda.py | 2 +- pyanaconda/installation.py | 6 +++--- pyanaconda/kickstart.py | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/anaconda.py b/anaconda.py index faaef9c3bc..2b3b42d19a 100755 --- a/anaconda.py +++ b/anaconda.py @@ -414,7 +414,7 @@ if __name__ == "__main__": anaconda.payload.set_from_opts(opts) # Initialize the security configuration. - startup_utils.initialize_security() + #startup_utils.initialize_security() # Set the language before loading an interface, when it may be too late. startup_utils.initialize_locale(opts, text_mode=anaconda.tui_mode) diff --git a/pyanaconda/installation.py b/pyanaconda/installation.py index 8a01847004..b98425e3cc 100644 --- a/pyanaconda/installation.py +++ b/pyanaconda/installation.py @@ -121,7 +121,7 @@ class RunInstallationTask(InstallationTask): ) # add installation tasks for the Security DBus module - if is_module_available(SECURITY): + if False: security_proxy = SECURITY.get_proxy() security_dbus_tasks = security_proxy.InstallWithTasks() os_config.append_dbus_tasks(SECURITY, security_dbus_tasks) @@ -146,7 +146,7 @@ class RunInstallationTask(InstallationTask): os_config.append_dbus_tasks(LOCALIZATION, localization_dbus_tasks) # add the Firewall configuration task - if conf.target.can_configure_network: + if False: firewall_proxy = NETWORK.get_proxy(FIREWALL) firewall_dbus_task = firewall_proxy.InstallWithTask() os_config.append_dbus_tasks(NETWORK, [firewall_dbus_task]) @@ -213,7 +213,7 @@ class RunInstallationTask(InstallationTask): )) configuration_queue.append(generate_initramfs) - if is_module_available(SECURITY): + if False: security_proxy = SECURITY.get_proxy() # Configure FIPS. diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index daf5ffdc04..9a6f32f777 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -259,6 +259,11 @@ class AnacondaKickstartSpecification(KickstartSpecification): command_map = dict(cls.commands) for name, command in handler.commandMap.items(): + # Skip unsupported commands + if name in ('auth', 'authconfig', 'authselect', 'firewall', + 'firstboot'): + continue + # Ignore removed commands. if issubclass(command, RemovedCommand): continue -- 2.7.4