Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/57'

Browse Source 
* origin/pr/57:
  archlinux: ensure systemctl reset preset correctly (need to be started twice)
This commit is contained in:
Marek Marczykowski-Górecki 2015-12-19 18:21:27 +01:00
commit e7d4830434
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archlinux/PKGBUILD
View File

@ -6,7 +6,7 @@
# Maintainer: Olivier Medoc <o_medoc@yahoo.fr> # Maintainer: Olivier Medoc <o_medoc@yahoo.fr>
pkgname=qubes-vm-core pkgname=qubes-vm-core
pkgver=`cat version` pkgver=`cat version`
pkgrel=1 pkgrel=2
epoch= epoch=
pkgdesc="The Qubes core files for installation inside a Qubes VM." pkgdesc="The Qubes core files for installation inside a Qubes VM."
arch=("x86_64") arch=("x86_64")

7
archlinux/PKGBUILD.install
View File

@ -151,13 +151,18 @@ configure_systemd() {
PRESET_FAILED=0 PRESET_FAILED=0
if [ $1 -eq 1 ]; then 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 else
services="qubes-dvm qubes-misc-post qubes-firewall qubes-mount-dirs" services="qubes-dvm qubes-misc-post qubes-firewall qubes-mount-dirs"
services="$services qubes-netwatcher qubes-network qubes-sysinit" services="$services qubes-netwatcher qubes-network qubes-sysinit"
services="$services qubes-iptables qubes-updates-proxy qubes-qrexec-agent" services="$services qubes-iptables qubes-updates-proxy qubes-qrexec-agent"
services="$services qubes-random-seed" services="$services qubes-random-seed"
for srv in $services; do for srv in $services; do
echo "Enable service defaults for $service"
systemctl --no-reload preset $srv.service systemctl --no-reload preset $srv.service
done done
systemctl --no-reload preset qubes-update-check.timer systemctl --no-reload preset qubes-update-check.timer