Use target for drivers in systemd

configure.ac

@@ -1295,7 +1295,7 @@ AC_OUTPUT([
  scripts/HP-UX/postinstall
  scripts/python/Makefile
  scripts/systemd/Makefile
- scripts/systemd/nut-driver.service
+ scripts/systemd/nut-driver@.service
  scripts/systemd/nut-monitor.service
  scripts/systemd/nut-server.service
  scripts/systemd/nutshutdown

scripts/systemd/Makefile.am

@@ -3,14 +3,15 @@ EXTRA_DIST = README
 if HAVE_SYSTEMD
 
 systemdsystemunit_DATA = \
-        nut-driver.service \
+        nut-driver@.service \
         nut-monitor.service \
-        nut-server.service
+        nut-server.service  \
+        nut-driver.target
 
 systemdsystemshutdown_SCRIPTS = nutshutdown
 
 else
-EXTRA_DIST += nut-driver.service.in nut-monitor.service.in \
-	nut-server.service.in nutshutdown.in
+EXTRA_DIST += nut-driver@.service.in nut-monitor.service.in \
+	nut-server.service.in nutshutdown.in nut-driver.target
 endif
 

scripts/systemd/nut-driver.target

@@ -0,0 +1,3 @@
+[Unit]
+Description=Network UPS Tools - power device driver controller
+After=local-fs.target network.target

scripts/systemd/nut-driver@.service.in

@@ -0,0 +1,12 @@
+[Unit]
+Description=Network UPS Tools - device driver for %I
+After=local-fs.target network.target
+PartOf=nut-driver.target
+
+[Service]
+ExecStart=@SBINDIR@/upsdrvctl start %i
+ExecStop=@SBINDIR@/upsdrvctl stop %i
+Type=forking
+
+[Install]
+WantedBy=multi-user.target nut-driver.target

scripts/systemd/nut-server.service.in

@@ -1,10 +1,10 @@
 [Unit]
 Description=Network UPS Tools - power devices information server
-After=local-fs.target network.target nut-driver.service
+After=local-fs.target network.target nut-driver.target
 # We don't Require drivers to be successfully started! This would be
 # a change of behavior compared to init SysV, and could prevent from
 # accessing successfully started, at least to audit a system.
-Wants=nut-driver.service
+Wants=nut-driver.target
 Before=nut-monitor.service
 
 [Service]