d/p/0004-fix-systemd-service.patch: Fix systemd service file for Debian

This commit is contained in:
Laurent Bigonville 2013-01-26 00:19:45 +01:00
parent 853f3503ce
commit 47044fe3b0
3 changed files with 31 additions and 1 deletions

3
debian/changelog vendored
View file

@ -8,6 +8,7 @@ nut (2.6.5-2) UNRELEASED; urgency=low
* debian/watch: Update watch file URL (Thanks to Bart Martens) * debian/watch: Update watch file URL (Thanks to Bart Martens)
* debian/rules: Alias systemd nut-monitor service file to nut-client to * debian/rules: Alias systemd nut-monitor service file to nut-client to
prevent it from running twice prevent it from running twice
* d/p/0004-fix-systemd-service.patch: Fix systemd service file for Debian
[ Sébastien Villemot ] [ Sébastien Villemot ]
* debian/nut-client.preinst: revert /etc/nut/nut.conf mangling done by older * debian/nut-client.preinst: revert /etc/nut/nut.conf mangling done by older
@ -20,7 +21,7 @@ nut (2.6.5-2) UNRELEASED; urgency=low
* Also remove /etc/init.d/nut in nut-client postinst. Thanks to * Also remove /etc/init.d/nut in nut-client postinst. Thanks to
Laurent Bigonville for the hint. Laurent Bigonville for the hint.
-- Laurent Bigonville <bigon@debian.org> Fri, 25 Jan 2013 23:13:51 +0100 -- Laurent Bigonville <bigon@debian.org> Sat, 26 Jan 2013 00:15:43 +0100
nut (2.6.5-1) experimental; urgency=low nut (2.6.5-1) experimental; urgency=low

View file

@ -0,0 +1,28 @@
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 udev-settle.service
+Wants=udev-settle.service
StopWhenUnneeded=yes
[Service]
-ExecStart=@driverexecdir@/upsdrvctl start
-ExecStop=@driverexecdir@/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

View file

@ -1,2 +1,3 @@
0003-install-dev-files-in-usr.patch 0003-install-dev-files-in-usr.patch
0002-nut-monitor-paths.patch 0002-nut-monitor-paths.patch
0004-fix-systemd-service.patch