From 343ce1814c31d5aecacebb31ba58931fa11914af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 7 Apr 2015 02:30:59 +0200
Subject: [PATCH] systemd: use presets to enable services, call preset-all

This way the services will be enabled/disabled regardless of its initial
state.
---
 rpm_spec/core-vm.spec         | 22 ++--------------------
 vm-systemd/75-qubes-vm.preset | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 77168c2..8130346 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -584,11 +584,7 @@ The Qubes core startup configuration for SystemD init.
 
 %post systemd
 
-for srv in qubes-dvm qubes-sysinit qubes-misc-post qubes-mount-home qubes-netwatcher qubes-network qubes-firewall qubes-updates-proxy qubes-qrexec-agent; do
-    /bin/systemctl --no-reload enable $srv.service 2> /dev/null
-done
-
-/bin/systemctl --no-reload enable qubes-update-check.timer 2> /dev/null
+/bin/systemctl --no-reload preset-all
 
 # Set default "runlevel"
 rm -f /etc/systemd/system/default.target
@@ -598,9 +594,7 @@ grep '^[[:space:]]*[^#;]' /lib/systemd/system-preset/75-qubes-vm.preset | while
     case "$action" in
     (disable)
         if [ -f /lib/systemd/system/$unit_name.service ]; then
-            if fgrep -q '[Install]' /lib/systemd/system/$unit_name; then
-                /bin/systemctl --no-reload preset $unit_name 2> /dev/null
-            else
+            if ! fgrep -q '[Install]' /lib/systemd/system/$unit_name; then
                 # forcibly disable
                 ln -sf /dev/null /etc/systemd/system/$unit_name
             fi
@@ -611,16 +605,6 @@ done
 
 rm -f /etc/systemd/system/getty.target.wants/getty@tty*.service
 
-# Enable some services
-/bin/systemctl --no-reload enable iptables.service 2> /dev/null
-/bin/systemctl --no-reload enable ip6tables.service 2> /dev/null
-/bin/systemctl --no-reload enable rsyslog.service 2> /dev/null
-/bin/systemctl --no-reload enable ntpd.service 2> /dev/null
-/bin/systemctl --no-reload enable crond.service 2> /dev/null
-
-# Enable cups only when it is real SystemD service
-[ -e /lib/systemd/system/cups.service ] && /bin/systemctl --no-reload enable cups.service 2> /dev/null
-
 /bin/systemctl daemon-reload
 
 exit 0
@@ -641,8 +625,6 @@ exit 0
 %installOverridenServices crond
 exit 0
 
-%triggerin systemd -- haveged
-/bin/systemctl enable haveged.service 2> /dev/null
 exit 0
 
 %postun systemd
diff --git a/vm-systemd/75-qubes-vm.preset b/vm-systemd/75-qubes-vm.preset
index 7887d05..aaeac2a 100644
--- a/vm-systemd/75-qubes-vm.preset
+++ b/vm-systemd/75-qubes-vm.preset
@@ -49,3 +49,22 @@ disable smartd.service
 disable upower.service
 disable irqbalance.service
 disable colord.service
+
+enable qubes-sysinit.service
+enable qubes-db.service
+enable qubes-gui-agent.service
+enable qubes-update-check.timer
+enable qubes-update-check.timer
+enable qubes-misc-post.service
+enable qubes-updates-proxy.service
+enable qubes-dvm.service
+enable qubes-network.service
+enable qubes-qrexec-agent.service
+enable qubes-mount-home.service
+enable qubes-firewall.service
+enable qubes-netwatcher.service
+enable qubes-meminfo-writer.service
+enable iptables.service
+enable ip6tables.service
+enable haveged.service
+enable chronyd.service