Hi,
The patch for service(8) has been moved to
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704923
As for the invoke-rc.d, an updated version is attached. mbiebl reviewed
it and it looks good to him. The version works differently than what was
posted previously because systemd has gained a heuristic for CanReload=
for sysvinit files in the meantime.
Roger, can I commit this (and the other changes) directly to the
jessie-pending branch?
--
Best regards,
Michael
diff --git i/debian/src/sysv-rc/sbin/invoke-rc.d w/debian/src/sysv-rc/sbin/invoke-rc.d
index 3d99591..3057eed 100644
--- i/debian/src/sysv-rc/sbin/invoke-rc.d
+++ w/debian/src/sysv-rc/sbin/invoke-rc.d
@@ -516,7 +516,7 @@ if test x${FORCE} != x || test ${RC} -eq 104 ; then
systemctl "${saction}" "${INITSCRIPTID}.service" && exit 0
;;
reload)
- _canreload="$(systemctl -p CanReload show $service 2>/dev/null)"
+ _canreload="$(systemctl -p CanReload show ${INITSCRIPTID}.service 2>/dev/null)"
if [ "$_canreload" = "CanReload=no" ]; then
"${INITDPREFIX}${INITSCRIPTID}" "${saction}" "$@" && exit 0
else
@@ -527,7 +527,12 @@ if test x${FORCE} != x || test ${RC} -eq 104 ; then
systemctl --signal=KILL kill "${INITSCRIPTID}.service" && exit 0
;;
force-reload)
- systemctl restart "${INITSCRIPTID}.service" && exit 0
+ _canreload="$(systemctl -p CanReload show ${INITSCRIPTID}.service 2>/dev/null)"
+ if [ "$_canreload" = "CanReload=no" ]; then
+ systemctl restart "${INITSCRIPTID}.service" && exit 0
+ else
+ systemctl reload "${INITSCRIPTID}.service" && exit 0
+ fi
;;
*)
# We try to run non-standard actions by running
