From 689166b91847431b318e8da650b51c336808b108 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 5 May 2023 16:41:39 +0200 Subject: [PATCH] dh systemd: use newer --no-start flag and autogen postinst With that, only comments change from our manual implementation, e.g., looking at diffoscope output from a build before and with this change: @@ -15,28 +15,27 @@ systemctl --system daemon-reload >/dev/null || true deb-systemd-invoke $dh_action "$unit" fi ;; esac -# Copied from dh_installsystemd/12.1.1 +# Automatically added by dh_installsystemd/13.11.4 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then - # This will only remove masks created by d-s-h on package removal. + # The following line should be removed in trixie or trixie+1 deb-systemd-helper unmask 'lxcfs.service' >/dev/null || true # was-enabled defaults to true, so new installations run enable. if deb-systemd-helper --quiet was-enabled 'lxcfs.service'; then # Enables the unit on first installation, creates new # symlinks on upgrades if the unit file has changed. deb-systemd-helper enable 'lxcfs.service' >/dev/null || true else # Update the statefile to add new symlinks (if any), which need to be # cleaned up on purge. Also remove old symlinks. deb-systemd-helper update-state 'lxcfs.service' >/dev/null || true fi fi +# End automatically added section -# dh_installsystemd cannot do a reload, you can only choose between stop-start, -# restart and try-restart. NONE of which are acceptable! exit 0 Signed-off-by: Thomas Lamprecht --- debian/lxcfs.postinst | 20 +------------------- debian/rules | 2 +- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/debian/lxcfs.postinst b/debian/lxcfs.postinst index 1fd7dce..344e5f2 100644 --- a/debian/lxcfs.postinst +++ b/debian/lxcfs.postinst @@ -19,24 +19,6 @@ case "$1" in esac -# Copied from dh_installsystemd/12.1.1 -if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then - # This will only remove masks created by d-s-h on package removal. - deb-systemd-helper unmask 'lxcfs.service' >/dev/null || true - - # was-enabled defaults to true, so new installations run enable. - if deb-systemd-helper --quiet was-enabled 'lxcfs.service'; then - # Enables the unit on first installation, creates new - # symlinks on upgrades if the unit file has changed. - deb-systemd-helper enable 'lxcfs.service' >/dev/null || true - else - # Update the statefile to add new symlinks (if any), which need to be - # cleaned up on purge. Also remove old symlinks. - deb-systemd-helper update-state 'lxcfs.service' >/dev/null || true - fi -fi - -# dh_installsystemd cannot do a reload, you can only choose between stop-start, -# restart and try-restart. NONE of which are acceptable! +#DEBHELPER# exit 0 diff --git a/debian/rules b/debian/rules index 6685a44..1b0c270 100755 --- a/debian/rules +++ b/debian/rules @@ -22,4 +22,4 @@ override_dh_installsystemd: install -dm755 $(CURDIR)/debian/lxcfs/lib mv $(CURDIR)/debian/lxcfs/usr/lib/systemd \ $(CURDIR)/debian/lxcfs/lib/systemd - dh_installsystemd -p lxcfs --no-stop-on-upgrade lxcfs.service + dh_installsystemd -p lxcfs --no-start --no-stop-on-upgrade lxcfs.service -- 2.39.5