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

qubes-anaconda-addon: drop --force-root option

Browse Source 
It isn't needed anymore and will be dropped in the future.
Also use qvm-start directly, instead of (soon to be removed) qubes-netvm
service.

QubesOS/qubes-issues#2412
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-31 02:26:18 +02:00
parent 3c4127b445
commit 493119be7b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 6 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

@ -531,7 +531,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
def configure_default_template(self):
self.set_stage('Setting default template')
self.run_command(['/usr/bin/qubes-prefs', '--force-root', 'default-template', self.default_template])
self.run_command(['/usr/bin/qubes-prefs', 'default-template', self.default_template])
def configure_default_dvm(self):
self.set_stage("Creating default DisposableVM")
@ -548,11 +548,11 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
if self.choice_whonix_default.get_selected():
default_netvm = 'sys-whonix'
self.run_command(['/usr/bin/qvm-prefs', '--force-root', 'sys-firewall', 'netvm', 'sys-net'])
self.run_command(['/usr/bin/qubes-prefs', '--force-root', 'default-netvm', default_netvm])
self.run_command(['/usr/bin/qubes-prefs', '--force-root', 'updatevm', default_netvm])
self.run_command(['/usr/bin/qubes-prefs', '--force-root', 'clockvm', 'sys-net'])
self.run_command(['/usr/sbin/service', 'qubes-netvm', 'start'])
self.run_command(['/usr/bin/qvm-prefs', 'sys-firewall', 'netvm', 'sys-net'])
self.run_command(['/usr/bin/qubes-prefs', 'default-netvm', default_netvm])
self.run_command(['/usr/bin/qubes-prefs', 'updatevm', default_netvm])
self.run_command(['/usr/bin/qubes-prefs', 'clockvm', 'sys-net'])
self.run_command(['/usr/bin/qvm-start', default_netvm])
def configure_template(self, template, path):
self.set_stage("Configuring TemplateVM {}".format(template))