From 3e04dab6197eea34cd266ceea54052fdf8f61f21 Mon Sep 17 00:00:00 2001 From: Carlos Nihelton Date: Fri, 16 Dec 2022 12:16:45 +0000 Subject: [PATCH] Interactive wsl_setup no longer writes wsl.conf That variant would only apply configs if in autoinstall. There are no more screens available related to those settings in wsl_setup. Reconfiguration variant is the only one able to write that file. --- system_setup/server/controllers/configure.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/system_setup/server/controllers/configure.py b/system_setup/server/controllers/configure.py index 1214c5a6..d9e770e2 100644 --- a/system_setup/server/controllers/configure.py +++ b/system_setup/server/controllers/configure.py @@ -413,18 +413,13 @@ class ConfigureController(SubiquityController): await self.create_user(root_dir, envcp) await self.apply_locale(lang, envcp) - else: + # update wsl.conf when it is in autoinstall mode or reconf variant. + if variant == "wsl_configuration" or \ + self.app.opts.autoinstall is not None: + wsl_config_update(self.model.wslconfbase.wslconfbase, root_dir) wsl_config_update(self.model.wslconfadvanced.wslconfadvanced, root_dir) - # update advanced config when it is in autoinstall mode - if self.app.opts.autoinstall is not None and \ - self.model.wslconfadvanced.wslconfadvanced is not None: - wsl_config_update(self.model.wslconfadvanced.wslconfadvanced, - root_dir) - - wsl_config_update(self.model.wslconfbase.wslconfbase, root_dir) - self.app.update_state(ApplicationState.DONE) except Exception: