firstboot: do not try to start sys-usb when it's combined with sys-net

QubesOS/qubes-issues#1629
2016-02-11 16:47:09 +01:00 · 2016-02-11 16:47:09 +01:00 · 1ea718d6fb
commit 1ea718d6fb
parent 27063bd284
1 changed files with 2 additions and 1 deletions
--- 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'])