From 86d19c6259dab9b462cedef777a92bcdd3b9e666 Mon Sep 17 00:00:00 2001 From: Carlos Nihelton Date: Mon, 29 Aug 2022 09:04:06 -0300 Subject: [PATCH 1/2] Sets WslSetupOptions as an optional controller We have strong defaults, so the clients should only need to POST if the desired options are not the default ones. --- system_setup/server/controllers/wslsetupoptions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system_setup/server/controllers/wslsetupoptions.py b/system_setup/server/controllers/wslsetupoptions.py index 70356042..c4b20bce 100644 --- a/system_setup/server/controllers/wslsetupoptions.py +++ b/system_setup/server/controllers/wslsetupoptions.py @@ -46,12 +46,14 @@ class WSLSetupOptionsController(SubiquityController): # load the config file data = default_loader() + conf_data = WSLSetupOptions() if data: proc_data = \ {key: convert_if_bool(value) for (key, value) in data.items()} conf_data = WSLSetupOptions(**proc_data) - self.model.apply_settings(conf_data) + + self.model.apply_settings(conf_data) def load_autoinstall_data(self, data): if data is not None: From c08ebef9df432ffd3d3edbfbf4c3bc2c29e7b8c3 Mon Sep 17 00:00:00 2001 From: Carlos Nihelton Date: Mon, 29 Aug 2022 12:15:52 -0300 Subject: [PATCH 2/2] Removes the controller name from the required set INSTALL_MODEL_NAMES --- system_setup/server/server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/system_setup/server/server.py b/system_setup/server/server.py index f5cdcbfa..d13f13a4 100644 --- a/system_setup/server/server.py +++ b/system_setup/server/server.py @@ -31,7 +31,6 @@ INSTALL_MODEL_NAMES = ModelNames({ "wslconfbase", }, wsl_setup={ - "wslsetupoptions", "identity", }, wsl_configuration={