diff --git a/examples/answers-system-setup-reconf.yaml b/examples/answers-system-setup-reconf.yaml index b526ae85..1268c545 100644 --- a/examples/answers-system-setup-reconf.yaml +++ b/examples/answers-system-setup-reconf.yaml @@ -8,6 +8,5 @@ WSLConfigurationAdvanced: interop_appendwindowspath: false automount_enabled: false automount_mountfstab: false - systemd_enabled: true Summary: reboot: yes \ No newline at end of file diff --git a/system_setup/client/controllers/wslconfadvanced.py b/system_setup/client/controllers/wslconfadvanced.py index 8c4c362d..342ce0ae 100644 --- a/system_setup/client/controllers/wslconfadvanced.py +++ b/system_setup/client/controllers/wslconfadvanced.py @@ -32,8 +32,7 @@ class WSLConfigurationAdvancedController(SubiquityTuiController): def run_answers(self): if all(elem in self.answers for elem in ['interop_enabled', 'interop_appendwindowspath', - 'automount_enabled', 'automount_mountfstab', - 'systemd_enabled']): + 'automount_enabled', 'automount_mountfstab']): reconfiguration = WSLConfigurationAdvanced(**self.answers) self.done(reconfiguration) diff --git a/system_setup/tests/golden/answers-reconf/wsl.conf b/system_setup/tests/golden/answers-reconf/wsl.conf index 2469d457..449819ba 100644 --- a/system_setup/tests/golden/answers-reconf/wsl.conf +++ b/system_setup/tests/golden/answers-reconf/wsl.conf @@ -4,9 +4,6 @@ mountfstab = false options = metadata root = /custom_mnt_path -[boot] -command = /usr/libexec/wsl-systemd - [interop] appendwindowspath = false enabled = false diff --git a/system_setup/ui/views/wslconfadvanced.py b/system_setup/ui/views/wslconfadvanced.py index 5f2ce247..9d7af7f6 100644 --- a/system_setup/ui/views/wslconfadvanced.py +++ b/system_setup/ui/views/wslconfadvanced.py @@ -59,10 +59,10 @@ class WSLConfigurationAdvancedForm(Form): BooleanField(_("Append Windows Path"), help=_("Whether Windows Path will be append in the" " PATH environment variable in WSL.")) - systemd_enabled = \ - BooleanField(_("Enable Systemd"), - help=_("EXPERIMENTAL - Whether systemd should be" - " activated at boot time.")) + # systemd_enabled = \ + # BooleanField(_("Enable Systemd"), + # help=_("EXPERIMENTAL - Whether systemd should be" + # " activated at boot time.")) class WSLConfigurationAdvancedView(BaseView): @@ -82,8 +82,8 @@ class WSLConfigurationAdvancedView(BaseView): configuration_data.automount_enabled, 'automount_mountfstab': configuration_data.automount_mountfstab, - 'systemd_enabled': - configuration_data.systemd_enabled, + # 'systemd_enabled': + # configuration_data.systemd_enabled, } self.form = WSLConfigurationAdvancedForm(initial=initial) @@ -107,6 +107,6 @@ class WSLConfigurationAdvancedView(BaseView): .automount_enabled.value, automount_mountfstab=self.form .automount_mountfstab.value, - systemd_enabled=self.form - .systemd_enabled.value, - )) + # systemd_enabled=self.form + # .systemd_enabled.value, + ))