[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:
parent
a04d93451b
commit
2a598a8b5d
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue