From 7c15b9b0eacbe726240f424c13d6b0a2c7f575ab Mon Sep 17 00:00:00 2001 From: HW42 Date: Thu, 28 Jul 2016 19:13:30 +0200 Subject: [PATCH] systemd: remove obsolete symlinks with rm instead of systemctl The systemctl in Debian unstable fails when trying to disable a removed service. The manpage do not mention a switch to change this behaviour. But it says: Note that this operation creates only the suggested symlinks for the units. While this command is the recommended way to manipulate the unit configuration directory, the administrator is free to make additional changes manually by placing or removing symlinks in the directory. So a simple rm should be fine. --- debian/qubes-core-agent.postinst | 4 ++-- rpm_spec/core-vm.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/qubes-core-agent.postinst b/debian/qubes-core-agent.postinst index 9ec5202..bfde8c8 100755 --- a/debian/qubes-core-agent.postinst +++ b/debian/qubes-core-agent.postinst @@ -130,10 +130,10 @@ case "${1}" in # remove old symlinks if [ -L /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service ]; then - systemctl --no-reload disable qubes-random-seed.service >/dev/null + rm /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service fi if [ -L /etc/systemd/system/multi-user.target.wants/qubes-mount-home.service ]; then - systemctl --no-reload disable qubes-mount-home.service >/dev/null + rm /etc/systemd/system/multi-user.target.wants/qubes-mount-home.service fi if ! dpkg-statoverride --list /var/lib/qubes/dom0-updates >/dev/null 2>&1; then diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index dba133c..88929c0 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -635,10 +635,10 @@ done # remove old symlinks if [ -L /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service ]; then - systemctl --no-reload disable qubes-random-seed.service >/dev/null + rm /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service fi if [ -L /etc/systemd/system/multi-user.target.wants/qubes-mount-home.service ]; then - systemctl --no-reload disable qubes-mount-home.service >/dev/null + rm /etc/systemd/system/multi-user.target.wants/qubes-mount-home.service fi /bin/systemctl daemon-reload