From 1c09b88fae9e361e6efc9540664f86ff4312027d Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Tue, 15 Dec 2015 16:20:03 +0100 Subject: [PATCH] archlinux: ensure systemctl reset preset correctly (need to be started twice) --- archlinux/PKGBUILD | 2 +- archlinux/PKGBUILD.install | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index c19c404..48e11ac 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: Olivier Medoc pkgname=qubes-vm-core pkgver=`cat version` -pkgrel=1 +pkgrel=2 epoch= pkgdesc="The Qubes core files for installation inside a Qubes VM." arch=("x86_64") diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index f5b6da4..58245f6 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -151,13 +151,18 @@ configure_systemd() { PRESET_FAILED=0 if [ $1 -eq 1 ]; then - systemctl --no-reload preset-all > /dev/null 2>&1 && PRESET_FAILED=0 || PRESET_FAILED=1 + # Needs to be started two times to deal with services name changes (systemctl bug?) + echo "Resetting systemd services to defaults presets (PASS 1)" + systemctl --no-reload preset-all 2>&1 && PRESET_FAILED=0 || PRESET_FAILED=1 + echo "Resetting systemd services to defaults presets (PASS 2)" + systemctl --no-reload preset-all 2>&1 && PRESET_FAILED=0 || PRESET_FAILED=1 else services="qubes-dvm qubes-misc-post qubes-firewall qubes-mount-dirs" services="$services qubes-netwatcher qubes-network qubes-sysinit" services="$services qubes-iptables qubes-updates-proxy qubes-qrexec-agent" services="$services qubes-random-seed" for srv in $services; do + echo "Enable service defaults for $service" systemctl --no-reload preset $srv.service done systemctl --no-reload preset qubes-update-check.timer