From 853f3503ce848548eb092ee904db5208b1e570a8 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Fri, 25 Jan 2013 23:17:36 +0100 Subject: [PATCH] debian/rules: Alias systemd nut-monitor service file to nut-client to prevent it from running twice --- debian/changelog | 4 +++- debian/rules | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 35237fa..b7eeeaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ nut (2.6.5-2) UNRELEASED; urgency=low * Restore proper SELinux context for runtime created /var/run/nut directory * debian/control: Fix typo in package description * debian/watch: Update watch file URL (Thanks to Bart Martens) + * debian/rules: Alias systemd nut-monitor service file to nut-client to + prevent it from running twice [ Sébastien Villemot ] * debian/nut-client.preinst: revert /etc/nut/nut.conf mangling done by older @@ -18,7 +20,7 @@ nut (2.6.5-2) UNRELEASED; urgency=low * Also remove /etc/init.d/nut in nut-client postinst. Thanks to Laurent Bigonville for the hint. - -- Laurent Bigonville Sun, 13 Jan 2013 17:36:13 +0100 + -- Laurent Bigonville Fri, 25 Jan 2013 23:13:51 +0100 nut (2.6.5-1) experimental; urgency=low diff --git a/debian/rules b/debian/rules index 9104960..2d6ca9e 100755 --- a/debian/rules +++ b/debian/rules @@ -79,6 +79,11 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) $(CURDIR)/debian/nut-server/lib/systemd/system/nut-driver.service 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 + + # This is needed to avoid services to be started twice (systemd and LSB) + mkdir -p $(CURDIR)/debian/nut-client/etc/systemd/system/ + ln -s /lib/systemd/system/nut-monitor.service \ + $(CURDIR)/debian/nut-client/etc/systemd/system/nut-client.service endif common-install-indep::