From d8fab041cf26abcf3f8a55c720a3c115fedff9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 16 Jul 2016 16:28:19 +0200 Subject: [PATCH] qubes-anaconda-addon: disable salt states after successful configuration Fixes QubesOS/qubes-issues#2173 --- .../org_qubes_os_initial_setup/gui/spokes/qubes_os.py | 5 +++++ 1 file changed, 5 insertions(+) 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 1bbe1db..7372b3b 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 @@ -507,6 +507,11 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke): try: self.run_command(['qubesctl', 'state.highstate']) + # After successful call disable all the states to not leave them + # enabled, to not interfere with later user changes (like assigning + # additional PCI devices) + for state in QubesChoice.get_states(): + self.run_command(['qubesctl', 'top.disable', state]) except Exception: raise Exception( ("Qubes initial configuration failed. Login to the system and " +