From e131cd00cbe1dd1b2d3e57329cf580e4fcacd483 Mon Sep 17 00:00:00 2001 From: Bernhard Reuter Date: Thu, 29 Aug 2024 12:56:23 +0200 Subject: [PATCH] fix debian packaging with debian 12 and ubuntu 24.04 (see PR #926 from phreaker0:fix-debian-package commit 4d39e39) --- packages/debian/postinst | 2 ++ packages/debian/rules | 6 ++---- .../{sanoid-prune.service => sanoid.sanoid-prune.service} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename packages/debian/{sanoid-prune.service => sanoid.sanoid-prune.service} (100%) diff --git a/packages/debian/postinst b/packages/debian/postinst index 0d6142fc..646a4619 100755 --- a/packages/debian/postinst +++ b/packages/debian/postinst @@ -2,3 +2,5 @@ # remove old cache file [ -f /var/cache/sanoidsnapshots.txt ] && rm /var/cache/sanoidsnapshots.txt || true +[ -f /var/cache/sanoid/snapshots.txt ] && rm /var/cache/sanoid/snapshots.txt || true +[ -f /var/cache/sanoid/datasets.txt ] && rm /var/cache/sanoid/datasets.txt || true diff --git a/packages/debian/rules b/packages/debian/rules index 51e52af4..05a37542 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -12,10 +12,6 @@ override_dh_auto_install: install -d $(DESTDIR)/etc/sanoid install -m 664 sanoid.defaults.conf $(DESTDIR)/etc/sanoid - install -d $(DESTDIR)/lib/systemd/system - install -m 664 debian/sanoid-prune.service debian/sanoid.timer \ - $(DESTDIR)/lib/systemd/system - install -d $(DESTDIR)/usr/sbin install -m 775 \ findoid sanoid sleepymutex syncoid \ @@ -25,6 +21,8 @@ override_dh_auto_install: install -m 664 sanoid.conf \ $(DESTDIR)/usr/share/doc/sanoid/sanoid.conf.example + dh_installsystemd --name sanoid-prune + override_dh_installinit: dh_installinit --noscripts diff --git a/packages/debian/sanoid-prune.service b/packages/debian/sanoid.sanoid-prune.service similarity index 100% rename from packages/debian/sanoid-prune.service rename to packages/debian/sanoid.sanoid-prune.service