system_setup: include full autoinstall system
This commit is contained in:
parent
031256c771
commit
7ae8e108a6
|
@ -0,0 +1,28 @@
|
|||
version: 1
|
||||
early-commands:
|
||||
- echo a
|
||||
- ["sleep", "1"]
|
||||
- echo a
|
||||
locale: en_US
|
||||
identity:
|
||||
realname: Ubuntu
|
||||
username: ubuntu
|
||||
# ubuntu
|
||||
password: '$6$wdAcoXrU039hKYPd$508Qvbe7ObUnxoj15DRCkzC3qO7edjH0VV7BPNRDYK4QR8ofJaEEF2heacn0QgD.f8pO8SNp83XNdWG6tocBM1'
|
||||
wslconfbase:
|
||||
automount_root: '/custom_mnt_path'
|
||||
automount_options: 'metadata'
|
||||
network_generatehosts: false
|
||||
network_generateresolvconf: false
|
||||
wslconfadvanced:
|
||||
interop_enabled: false
|
||||
interop_appendwindowspath: false
|
||||
gui_theme: 'light'
|
||||
gui_followwintheme: true
|
||||
interop_guiintegration: true
|
||||
interop_audiointegration: true
|
||||
interop_advancedipdetection: true
|
||||
motd_wslnewsenabled: false
|
||||
automount_enabled: false
|
||||
automount_mountfstab: false
|
||||
shutdown: 'reboot'
|
|
@ -14,15 +14,4 @@ wslconfbase:
|
|||
automount_options: 'metadata'
|
||||
network_generatehosts: false
|
||||
network_generateresolvconf: false
|
||||
wslconfadvanced:
|
||||
interop_enabled: false
|
||||
interop_appendwindowspath: false
|
||||
gui_theme: 'light'
|
||||
gui_followwintheme: true
|
||||
interop_guiintegration: true
|
||||
interop_audiointegration: true
|
||||
interop_advancedipdetection: true
|
||||
motd_wslnewsenabled: false
|
||||
automount_enabled: false
|
||||
automount_mountfstab: false
|
||||
shutdown: 'reboot'
|
|
@ -115,13 +115,14 @@ grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades:
|
|||
|
||||
# The OOBE doesn't exist in WSL < 20.04
|
||||
if [ "${RELEASE%.*}" -ge 20 ]; then
|
||||
# NOTE:
|
||||
# This test doesnt do much ATM but it will be useful when we have more complex scenarios to test with the server and client code.
|
||||
# Like generating a wsl.conf file and comparing it to the oracle.
|
||||
clean
|
||||
timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m system_setup.cmd.tui --autoinstall examples/autoinstall-system-setup.yaml --dry-run"
|
||||
validate "system_setup" "autoinstall"
|
||||
|
||||
clean
|
||||
timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m system_setup.cmd.tui --autoinstall examples/autoinstall-system-setup-full.yaml --dry-run"
|
||||
validate "system_setup" "autoinstall-full"
|
||||
|
||||
python3 -m system_setup.cmd.schema > "$testschema"
|
||||
scripts/schema-cmp.py "autoinstall-system-setup-schema.json" "$testschema" --ignore-tz
|
||||
fi
|
||||
|
|
|
@ -99,6 +99,12 @@ class ConfigureController(SubiquityController):
|
|||
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)
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
[GUI]
|
||||
followwintheme = true
|
||||
theme = light
|
||||
|
||||
[Interop]
|
||||
advancedipdetection = true
|
||||
audiointegration = true
|
||||
guiintegration = true
|
||||
|
||||
[Motd]
|
||||
wslnewsenabled = false
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
[automount]
|
||||
enabled = false
|
||||
mountfstab = false
|
||||
options = metadata
|
||||
root = /custom_mnt_path
|
||||
|
||||
[interop]
|
||||
appendwindowspath = false
|
||||
enabled = false
|
||||
|
||||
[network]
|
||||
generatehosts = false
|
||||
generateresolvconf = false
|
||||
|
Loading…
Reference in New Issue