debian/rules, debian/control, d/p/0004-fix-systemd-service.patch: Use a symlink instead of an Alias= to mask the SysV initscript

This commit is contained in:
Laurent Bigonville 2013-12-09 20:03:34 +01:00
parent e02d926691
commit 9b564eb7df
4 changed files with 11 additions and 8 deletions

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
nut (2.7.1-2) UNRELEASED; urgency=low
* debian/rules, debian/control, d/p/0004-fix-systemd-service.patch: Use a
symlink instead of an Alias= to mask the SysV initscript
-- Laurent Bigonville <bigon@debian.org> Mon, 09 Dec 2013 20:03:24 +0100
nut (2.7.1-1) unstable; urgency=low
* New upstream release (Closes: #730183)

2
debian/control vendored
View file

@ -6,7 +6,7 @@ Uploaders: Laurent Bigonville <bigon@debian.org>
Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.122~),
autotools-dev,
dh-systemd (>= 1.4),
dh-systemd (>= 1.14),
libgd-dev | libgd2-xpm-dev | libgd2-noxpm-dev,
libsnmp-dev | libsnmp9-dev,
libusb-dev (>= 0.1.8),

View file

@ -19,13 +19,6 @@ Forwarded: not-needed
+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 @@

3
debian/rules vendored
View file

@ -80,6 +80,9 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
install -m 644 -D $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/systemd/system/nut-server.service \
$(CURDIR)/debian/nut-server/lib/systemd/system/nut-server.service
# Add a symlink to mask the LSB initscript
ln -s nut-monitor.service $(CURDIR)/debian/nut-client/lib/systemd/system/nut-client.service
# Install tmpfiles config file to create /run/nut directory
install -m 644 -D $(CURDIR)/debian/nut-client.tmpfiles \
$(CURDIR)/debian/nut-client/usr/lib/tmpfiles.d/nut-client.conf