From 3c4127b445f4aff5c8b31bfc234395db3dd892a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 31 May 2017 02:25:01 +0200 Subject: [PATCH] qubes-anaconda-addon: update Disposable VM preparation code We don't have to create savefile anymore, create normal AppVM and set dispvm_allowed=True on it. QubesOS/qubes-issues#2412 --- .../org_qubes_os_initial_setup/gui/spokes/qubes_os.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py index 09841d8..6edccff 100644 --- a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py +++ b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py @@ -536,13 +536,10 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke): def configure_default_dvm(self): self.set_stage("Creating default DisposableVM") - try: - self.run_command(['su', '-c', '/usr/bin/qvm-create-default-dvm --default-template --default-script', self.qubes_user]) - except Exception: - # Kill DispVM template if still running - # Do not use self.run_command to not clobber process output - subprocess.call(['qvm-kill', '{}-dvm'.format(self.default_template)]) - raise + dispvm_name = self.default_template + '-dvm' + self.run_command(['/usr/bin/qvm-create', '--label', 'red', dispvm_name]) + self.run_command(['/usr/bin/qvm-prefs', dispvm_name, 'dispvm_allowed', 'True']) + self.run_command(['/usr/bin/qubes-prefs', 'default-dispvm', default_dispvm]) def configure_network(self): self.set_stage('Setting up networking')