Subject: Fix systemd service file for Debian
From: Laurent Bigonville <bigon@debian.org>
Forwarded: not-needed

--- a/scripts/systemd/nut-driver.service.in
+++ b/scripts/systemd/nut-driver.service.in
@@ -1,10 +1,11 @@
 [Unit]
 Description=Network UPS Tools - power device driver controller
-After=local-fs.target network.target
+After=local-fs.target network.target systemd-udev-settle.service
+Wants=systemd-udev-settle.service
 StopWhenUnneeded=yes
 
 [Service]
-ExecStart=@DRVPATH@/upsdrvctl start
-ExecStop=@DRVPATH@/upsdrvctl stop
+ExecStart=@SBINDIR@/upsdrvctl start
+ExecStop=@SBINDIR@/upsdrvctl stop
 Type=forking
 
--- a/scripts/systemd/nut-monitor.service.in
+++ b/scripts/systemd/nut-monitor.service.in
@@ -9,3 +9,4 @@ Type=forking
 
 [Install]
 WantedBy=multi-user.target
+Alias=nut-client.service
--- a/scripts/systemd/nutshutdown.in
+++ b/scripts/systemd/nutshutdown.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@SBINDIR@/upsmon -K >/dev/null 2>&1 && @driverexecdir@/upsdrvctl shutdown
+@SBINDIR@/upsmon -K >/dev/null 2>&1 && @SBINDIR@/upsdrvctl shutdown