[WSL] Fixes wrong paramters being passed ...

to the WSLSetupOptions controller.

Misuse of the default_loader().
That's meant for loading /etc/wsl.conf.
WSLSetupOptions is by design not related to that config file.
This commit is contained in:
Carlos Nihelton 2022-09-15 13:47:06 -03:00
parent a04d93451b
commit 2a598a8b5d
No known key found for this signature in database
GPG Key ID: 6FE346D245197E9A
1 changed files with 0 additions and 18 deletions

View File

@ -22,9 +22,6 @@ from subiquity.common.apidef import API
from subiquity.common.types import WSLSetupOptions from subiquity.common.types import WSLSetupOptions
from subiquity.server.controller import SubiquityController from subiquity.server.controller import SubiquityController
from system_setup.common.wsl_conf import default_loader
from system_setup.common.wsl_utils import convert_if_bool
log = logging.getLogger('system_setup.server.controllers.wslsetupoptions') log = logging.getLogger('system_setup.server.controllers.wslsetupoptions')
@ -41,21 +38,6 @@ class WSLSetupOptionsController(SubiquityController):
'additionalProperties': False, 'additionalProperties': False,
} }
def __init__(self, app):
super().__init__(app)
# load the config file
root_dir = self.app.base_model.root
data = default_loader(root_dir)
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)
def load_autoinstall_data(self, data): def load_autoinstall_data(self, data):
if data is not None: if data is not None:
identity_data = WSLSetupOptions(**data) identity_data = WSLSetupOptions(**data)