From 1ea718d6fb414f158aa58ad7ed1d9ea6b80a0bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 11 Feb 2016 16:47:09 +0100 Subject: [PATCH] firstboot: do not try to start sys-usb when it's combined with sys-net QubesOS/qubes-issues#1629 --- firstboot/modules/qubes_setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/firstboot/modules/qubes_setup.py b/firstboot/modules/qubes_setup.py index 80d55b1..643ba8c 100644 --- a/firstboot/modules/qubes_setup.py +++ b/firstboot/modules/qubes_setup.py @@ -213,7 +213,8 @@ class moduleClass(Module): self.configure_default_template() self.configure_qubes() self.configure_network() - if self.choice_usb.get_selected(): + if self.choice_usb.get_selected() \ + and not self.choice_usb_with_net.get_selected(): # Workaround for #1464 (so qvm.start from salt can't be used) self.run_command_in_thread(['systemctl', 'start', 'qubes-vm@sys-usb.service'])