StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed systemd from the UI 

We won't ship systemd officially in 22.04, hence remove it from the UI.
However it's still there and distributed and can be enabled manually.

Co-authored-by: Didier Roche <didrocks@ubuntu.com>
This commit is contained in:
Jean-Baptiste Lallement 2022-04-07 10:55:30 +02:00
parent 9ff8e10ef5
commit a3a21da408
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/answers-system-setup-reconf.yaml
View File

@ -8,6 +8,5 @@ WSLConfigurationAdvanced:
interop_appendwindowspath: false interop_appendwindowspath: false
automount_enabled: false automount_enabled: false
automount_mountfstab: false automount_mountfstab: false
systemd_enabled: true
Summary: Summary:
reboot: yes reboot: yes

3
system_setup/client/controllers/wslconfadvanced.py
View File

@ -32,8 +32,7 @@ class WSLConfigurationAdvancedController(SubiquityTuiController):
def run_answers(self): def run_answers(self):
if all(elem in self.answers for elem in if all(elem in self.answers for elem in
['interop_enabled', 'interop_appendwindowspath', ['interop_enabled', 'interop_appendwindowspath',
'automount_enabled', 'automount_mountfstab', 'automount_enabled', 'automount_mountfstab']):
'systemd_enabled']):
reconfiguration = WSLConfigurationAdvanced(**self.answers) reconfiguration = WSLConfigurationAdvanced(**self.answers)
self.done(reconfiguration) self.done(reconfiguration)

3
system_setup/tests/golden/answers-reconf/wsl.conf
View File

@ -4,9 +4,6 @@ mountfstab = false
options = metadata options = metadata
root = /custom_mnt_path root = /custom_mnt_path
[boot]
command = /usr/libexec/wsl-systemd
[interop] [interop]
appendwindowspath = false appendwindowspath = false
enabled = false enabled = false

16
system_setup/ui/views/wslconfadvanced.py
View File

@ -59,10 +59,10 @@ class WSLConfigurationAdvancedForm(Form):
BooleanField(_("Append Windows Path"), BooleanField(_("Append Windows Path"),
help=_("Whether Windows Path will be append in the" help=_("Whether Windows Path will be append in the"
" PATH environment variable in WSL.")) " PATH environment variable in WSL."))
systemd_enabled = \ # systemd_enabled = \
BooleanField(_("Enable Systemd"), # BooleanField(_("Enable Systemd"),
help=_("EXPERIMENTAL - Whether systemd should be" # help=_("EXPERIMENTAL - Whether systemd should be"
" activated at boot time.")) # " activated at boot time."))
class WSLConfigurationAdvancedView(BaseView): class WSLConfigurationAdvancedView(BaseView):
@ -82,8 +82,8 @@ class WSLConfigurationAdvancedView(BaseView):
configuration_data.automount_enabled, configuration_data.automount_enabled,
'automount_mountfstab': 'automount_mountfstab':
configuration_data.automount_mountfstab, configuration_data.automount_mountfstab,
'systemd_enabled': # 'systemd_enabled':
configuration_data.systemd_enabled, # configuration_data.systemd_enabled,
} }
self.form = WSLConfigurationAdvancedForm(initial=initial) self.form = WSLConfigurationAdvancedForm(initial=initial)
@ -107,6 +107,6 @@ class WSLConfigurationAdvancedView(BaseView):
.automount_enabled.value, .automount_enabled.value,
automount_mountfstab=self.form automount_mountfstab=self.form
.automount_mountfstab.value, .automount_mountfstab.value,
systemd_enabled=self.form # systemd_enabled=self.form
.systemd_enabled.value, # .systemd_enabled.value,
)) ))