Bladeren bron

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.
HW42 7 jaren geleden
bovenliggende
commit
7c15b9b0ea
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 2 2
      debian/qubes-core-agent.postinst
  2. 2 2
      rpm_spec/core-vm.spec

+ 2 - 2
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

+ 2 - 2
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