Control: tags -1 + patch
Hi Matthew,
On Thu, Aug 24, 2023 at 02:03:45PM +0100, Matthew Vernon wrote:
> I'm afraid I really don't want to be making the process of adding scripts to
> o-s-s any more fiddly (and thus annoying and error-prone) than it already
> is, so I don't think an approach that relies on every single trigger having
> to be duplicated by hand is sustainable.
Thanks for the timely feedback. My understanding is that you are happy
with generating the trigger interest declaration during build. I'm
updating the patch accordingly. Hope this works for you.
Helmut
diff --minimal -Nru orphan-sysvinit-scripts-0.14/debian/changelog
orphan-sysvinit-scripts-0.14+nmu1/debian/changelog
--- orphan-sysvinit-scripts-0.14/debian/changelog 2023-02-24
11:01:40.000000000 +0100
+++ orphan-sysvinit-scripts-0.14+nmu1/debian/changelog 2023-08-24
17:56:25.000000000 +0200
@@ -1,3 +1,10 @@
+orphan-sysvinit-scripts (0.14+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Duplicate triggers for /usr-merge. (Closes: #1043420)
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 24 Aug 2023 17:56:25 +0200
+
orphan-sysvinit-scripts (0.14) unstable; urgency=medium
* Divert rsyslog-rotate with a portable version (Closes: #1031854)
diff --minimal -Nru orphan-sysvinit-scripts-0.14/debian/clean
orphan-sysvinit-scripts-0.14+nmu1/debian/clean
--- orphan-sysvinit-scripts-0.14/debian/clean 1970-01-01 01:00:00.000000000
+0100
+++ orphan-sysvinit-scripts-0.14+nmu1/debian/clean 2023-08-24
17:56:25.000000000 +0200
@@ -0,0 +1 @@
+debian/orphan-sysvinit-scripts.triggers
diff --minimal -Nru
orphan-sysvinit-scripts-0.14/debian/orphan-sysvinit-scripts.triggers
orphan-sysvinit-scripts-0.14+nmu1/debian/orphan-sysvinit-scripts.triggers
--- orphan-sysvinit-scripts-0.14/debian/orphan-sysvinit-scripts.triggers
2023-02-24 11:01:40.000000000 +0100
+++ orphan-sysvinit-scripts-0.14+nmu1/debian/orphan-sysvinit-scripts.triggers
1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-interest-noawait /lib/systemd/system/NetworkManager.service
-interest-noawait /lib/systemd/system/avahi-daemon.service
-interest-noawait /lib/systemd/system/avahi-dnsconfd.service
-interest-noawait /lib/systemd/system/dirsrv.service
-interest-noawait /lib/systemd/system/dnscrypt-proxy.service
-interest-noawait /lib/systemd/system/firewalld.service
-interest-noawait /lib/systemd/system/gpsd.service
-interest-noawait /lib/systemd/system/nftables.service
-interest-noawait /lib/systemd/system/pdns.service
-interest-noawait /lib/systemd/system/rsyslog.service
-interest-noawait /lib/systemd/system/tomcat9.service
diff --minimal -Nru orphan-sysvinit-scripts-0.14/debian/rules
orphan-sysvinit-scripts-0.14+nmu1/debian/rules
--- orphan-sysvinit-scripts-0.14/debian/rules 2023-02-24 11:01:40.000000000
+0100
+++ orphan-sysvinit-scripts-0.14+nmu1/debian/rules 2023-08-24
17:56:25.000000000 +0200
@@ -5,3 +5,12 @@
%:
dh $@
+
+# We generate the triggers from the unit mapping. When doing so, we also
+# mitigate DEP-17 P6 via M20 by duplicating each trigger for / and /usr. The
+# duplication can be removed after forky is released and only the /usr interest
+# should remain.
+debian/orphan-sysvinit-scripts.triggers:lib/mapping
+ sed '/^#/d;s,^\(\S*\) .*,interest-noawait /lib/systemd/system/\1,;p;s,
, /usr,' <$< >$@
+
+execute_before_dh_installdeb: debian/orphan-sysvinit-scripts.triggers
