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

Merge pull request #1089 from canonical/wsl_oobe_conf_fixes 

WSL OOBE - several fixes that should be merged before DEENG-82
This commit is contained in:
Didier Roche 2021-10-08 11:30:57 +02:00 committed by GitHub
parent 66021ef6e2 5879b41e48
commit 8cf0b5350f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subiquity/common/types.py
View File

@ -388,7 +388,7 @@ class WSLConfigurationBase:
@attr.s(auto_attribs=True) @attr.s(auto_attribs=True)
class WSLConfigurationAdvanced: class WSLConfigurationAdvanced:
gui_theme: str = attr.ib(default='default') gui_theme: str = attr.ib(default='default')
gui_followwintheme: bool = attr.ib(default=True) gui_followwintheme: bool = attr.ib(default=False)
interop_guiintegration: bool = attr.ib(default=False) interop_guiintegration: bool = attr.ib(default=False)
interop_audiointegration: bool = attr.ib(default=False) interop_audiointegration: bool = attr.ib(default=False)
interop_advancedipdetection: bool = attr.ib(default=False) interop_advancedipdetection: bool = attr.ib(default=False)

8
system_setup/common/wsl_conf.py
View File

@ -145,18 +145,20 @@ def wsl_config_update(config_class, root_dir):
config_api_name = \ config_api_name = \
config_section.lower() + "_" + config_setting.lower() config_section.lower() + "_" + config_setting.lower()
config_value = config_class.__dict__[config_api_name] config_value = config_class.__dict__[config_api_name]
if isinstance(config_value, bool):
config_value = str(config_value).lower()
# if the value for the setting is default value, drop it # if the value for the setting is default value, drop it
if config_default_value == config_value: if config_default_value == config_value:
if config_section in config:
if config_setting in config[config_section]: if config_setting in config[config_section]:
config.remove_option(config_section, config_setting) config.remove_option(config_section,
config_setting)
# drop the section if it become empty # drop the section if it become empty
if config[config_section] == {}: if config[config_section] == {}:
config.remove_section(config_section) config.remove_section(config_section)
else: else:
if config_section not in config: if config_section not in config:
config.add_section(config_section) config.add_section(config_section)
if isinstance(config_value, bool):
config_value = str(config_value).lower()
config[config_section][config_setting] = config_value config[config_section][config_setting] = config_value
with open(conf_file + ".new", 'w+') as configfile: with open(conf_file + ".new", 'w+') as configfile: