debian/patches/0004-fix-systemd-service.patch: Refreshed

This commit is contained in:
Laurent Bigonville 2014-04-22 20:55:43 +02:00
parent a766575eca
commit c94a1d80c6
2 changed files with 3 additions and 14 deletions

3
debian/changelog vendored
View file

@ -2,6 +2,7 @@ nut (2.7.2-1) UNRELEASED; urgency=low
* New upstream release * New upstream release
- Fix the undefined references (Closes: #731156) - Fix the undefined references (Closes: #731156)
- debian/patches/0004-fix-systemd-service.patch: Refreshed
* debian/rules, debian/control, d/p/0004-fix-systemd-service.patch: Use a * debian/rules, debian/control, d/p/0004-fix-systemd-service.patch: Use a
symlink instead of an Alias= to mask the SysV initscript symlink instead of an Alias= to mask the SysV initscript
* debian/control: Bump Standards-Version to 3.9.5 (no further changes) * debian/control: Bump Standards-Version to 3.9.5 (no further changes)
@ -10,7 +11,7 @@ nut (2.7.2-1) UNRELEASED; urgency=low
* debian/control, debian/rules: Call dh-autoreconf and pass LDFLAGS to * debian/control, debian/rules: Call dh-autoreconf and pass LDFLAGS to
minimize runtime dependencies minimize runtime dependencies
-- Laurent Bigonville <bigon@debian.org> Tue, 22 Apr 2014 20:42:08 +0200 -- Laurent Bigonville <bigon@debian.org> Tue, 22 Apr 2014 20:55:27 +0200
nut (2.7.1-1) unstable; urgency=low nut (2.7.1-1) unstable; urgency=low

View file

@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/scripts/systemd/nut-driver.service.in --- a/scripts/systemd/nut-driver.service.in
+++ b/scripts/systemd/nut-driver.service.in +++ b/scripts/systemd/nut-driver.service.in
@@ -1,10 +1,11 @@ @@ -1,6 +1,7 @@
[Unit] [Unit]
Description=Network UPS Tools - power device driver controller Description=Network UPS Tools - power device driver controller
-After=local-fs.target network.target -After=local-fs.target network.target
@ -13,15 +13,3 @@ Forwarded: not-needed
StopWhenUnneeded=yes StopWhenUnneeded=yes
[Service] [Service]
-ExecStart=@DRVPATH@/upsdrvctl start
-ExecStop=@DRVPATH@/upsdrvctl stop
+ExecStart=@SBINDIR@/upsdrvctl start
+ExecStop=@SBINDIR@/upsdrvctl stop
Type=forking
--- 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