From 1cda66e1eeaf1df897af03881879f2b8269c7c07 Mon Sep 17 00:00:00 2001 From: "M. Vefa Bicakci" Date: Sun, 10 Apr 2016 00:00:00 -0400 Subject: [PATCH] qubes-anaconda-addon: Disable rdisc and kdump at first boot --- qubes-anaconda-addon/firstboot-qubes-text | 5 +++++ .../org_qubes_os_initial_setup/gui/spokes/qubes_os.py | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/qubes-anaconda-addon/firstboot-qubes-text b/qubes-anaconda-addon/firstboot-qubes-text index aa34802..949654a 100755 --- a/qubes-anaconda-addon/firstboot-qubes-text +++ b/qubes-anaconda-addon/firstboot-qubes-text @@ -91,6 +91,11 @@ done set -e +for service in rdisc kdump; do + systemctl disable ${service}.service || : + systemctl stop ${service}.service || : +done + if [ "$vms_template" == "yes" ]; then for template in `ls /var/lib/qubes/vm-templates`; do echo "-> Configuring template $template..." 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 c450a2e..f75c529 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 @@ -423,6 +423,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke): except Exception as e: errors.append((self.stage, str(e))) + self.configure_dom0() self.configure_default_template() self.configure_qubes() self.configure_network() @@ -480,6 +481,13 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke): return (stdout, stderr) + def configure_dom0(self): + self.set_stage("Setting up administration VM (dom0)") + + for service in [ 'rdisc', 'kdump' ]: + self.run_command(['systemctl', 'disable', '{}.service'.format(service) ], ignore_failure=True) + self.run_command(['systemctl', 'stop', '{}.service'.format(service) ], ignore_failure=True) + def configure_qubes(self): self.set_stage('Executing qubes configuration')