From 74005a240b91b4b035de3e76d79c44f942218f83 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 26 Jan 2013 22:39:54 +0100 Subject: [PATCH] firstboot: run most qvm-tools as normal user As warning says, to not lead into permission problems (eg for menu entries). --- firstboot/modules/qubes_setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/firstboot/modules/qubes_setup.py b/firstboot/modules/qubes_setup.py index 7932134..065b75b 100644 --- a/firstboot/modules/qubes_setup.py +++ b/firstboot/modules/qubes_setup.py @@ -175,18 +175,18 @@ class moduleClass(Module): return net_devices def do_create_netvm(self): - self.run_command(['/usr/bin/qvm-create', '--force-root', '--net', '--label', 'red', self.netvm_name]) + self.run_command(['su', '-c', '/usr/bin/qvm-create --net --label red %s' % self.netvm_name, self.qubes_user]) for dev in self.find_net_devices(): self.run_command(['/usr/bin/qvm-pci', '-a', self.netvm_name, dev]) def do_create_fwvm(self): - self.run_command(['/usr/bin/qvm-create', '--force-root', '--proxy', '--label', 'green', self.fwvm_name]) + self.run_command(['su', '-c', '/usr/bin/qvm-create --proxy --label green %s' % self.fwvm_name, '-', self.qubes_user]) def do_create_dvm(self): - self.run_command(['/usr/bin/qvm-create-default-dvm', '--default-template', '--default-script']) + self.run_command(['su', '-c', '/usr/bin/qvm-create-default-dvm --default-template --default-script', self.qubes_user]) def do_set_netvm_networking(self): - self.run_command(['/usr/bin/qvm-prefs', '--set', self.fwvm_name, 'netvm', self.netvm_name]) + self.run_command(['/usr/bin/qvm-prefs', '--force-root', '--set', self.fwvm_name, 'netvm', self.netvm_name]) self.run_command(['/usr/bin/qubes-prefs', '--set', 'default-netvm', self.fwvm_name]) def do_set_dom0_networking(self):