QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes-anaconda-addon: adjust usbvm setup to simplified states

Browse Source 
Don't use separte state for combined sys-net+sys-usb. Instead, use
pillar to adjust sys-usb state.

QubesOS/qubes-issues#3516
This commit is contained in:
Marek Marczykowski-Górecki 2018-03-02 20:55:43 +01:00
parent e83c0b4edc
commit 425a82ed2e
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
View File

@ -274,9 +274,8 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
self.choice_usb_with_net = QubesChoice(
_("Use sys-net qube for both networking and USB devices"),
('qvm.sys-net-with-usb',),
('pillar.qvm.sys-net-as-usbvm',),
depend=self.choice_usb,
replace=('qvm.sys-usb',),
indent=True
)
@ -516,7 +515,11 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
for state in QubesChoice.get_states():
print("Setting up state: {}".format(state))
self.run_command(['qubesctl', 'top.enable', state])
if state.startswith('pillar.'):
self.run_command(['qubesctl', 'top.enable',
state[len('pillar.'):], 'pillar=True'])
else:
self.run_command(['qubesctl', 'top.enable', state])
try:
self.run_command(['qubesctl', 'state.highstate'])
@ -524,7 +527,8 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
# enabled, to not interfere with later user changes (like assigning
# additional PCI devices)
for state in QubesChoice.get_states():
self.run_command(['qubesctl', 'top.disable', state])
if not state.startswith('pillar.'):
self.run_command(['qubesctl', 'top.disable', state])
except Exception:
raise Exception(
("Qubes initial configuration failed. Login to the system and " +