add-service: on package upgrade, restart all instances of template units.

1 files changed, 17 insertions, 2 deletions

diff --git a/add-service b/add-service
index ac1d29b..7e00cce 100755
--- a/add-service
+++ b/add-service
@@ -260,8 +260,23 @@ else
     if [ x$init = xsystemd ]; then
         # Package install may have changed the unit file, so reload the daemon
         # before trying to restart anything
-        /bin/systemctl --system daemon-reload
-        /bin/systemctl --quiet try-restart $units
+        if [ x$reloaded = xno ]; then
+            /bin/systemctl --system daemon-reload
+        fi
+        # There may be template units, so attempt to find all instances and
+        # restart them.
+        for unit in $units; do
+            if [[ "$unit" =~ "@.service" ]]; then
+                instances=$(/bin/systemctl -a --full list-units | grep -E "${unit%@.service}@[^ ]+.service" | awk '{ print $1 }')
+                if [ -n "$instances" ]; then
+                    for iunit in $instances; do
+                        /bin/systemctl --quiet try-restart $iunit
+                    done
+                fi
+            else
+                /bin/systemctl --quiet try-restart $unit
+            fi
+        done
     elif [ -f /etc/rc.d/init.d/$srv ]; then
         script=$(check_sysvinit_service 3 $srv);
         if [ -f "$script" ]; then