Hi all-- On Tue 2017-05-30 13:07:01 -0400, Daniel Kahn Gillmor wrote: > I've now done this NMU, and filed #863732 to unblock the upload. > > I've pushed the changes in a git branch to > https://anonscm.debian.org/git/collab-maint/runit.git, which is forked > from of https://anonscm.debian.org/git/users/kaction-guest/runit.git and > should probably be re-merged at some point. > > fwiw, the practice of keeping just the debian/ directory in git seems > odd to me and makes it more difficult for me to contribute to the > NMU-maintenance of the package. if i was going to do more work on the > package, i'd certainly prefer it to be converted to a standard > git-buildpackage-style "ladder" repo.
I regret to say that i think i did this upload suboptimally. by just dropping the runit-init package, we've left debian users who want runit as pid 1 with no options other than to rebuild the package, because nothing is shipping /sbin/runit or /sbin/runit-init. in jessie, /sbin/runit and /sbin/runit-init are both shipped in the runit package. What i should have done is to move /sbin/runit and /sbin/runit-init into the runit package itself, rather than drop them entirely. I've made this change and would like to propose a 2.1.2-9.2 upload, with attached debdiff. I've tested this with a guest system which now does load runit as PID 1 when booted with a kernel argument of "init=/sbin/runit-init". I apologize for the oversight, and want to know if it'd be ok for me to upload 2.1.2-9.2 using the attached debdiff. I've pushed a queue of these changes into the "unstable" branch at https://anonscm.debian.org/git/collab-maint/runit.git already if you'd prefer to review them there. Regards, --dkg
diff -Nru runit-2.1.2/debian/changelog runit-2.1.2/debian/changelog
--- runit-2.1.2/debian/changelog 2017-05-30 11:46:28.000000000 -0400
+++ runit-2.1.2/debian/changelog 2017-05-31 12:44:38.000000000 -0400
@@ -1,3 +1,11 @@
+runit (2.1.2-9.2) unstable; urgency=medium
+
+ * non-maintainer upload
+ * re-add /sbin/runit{,-init} to runit package so it remains possible to
+ use runit as PID 1
+
+ -- Daniel Kahn Gillmor <d...@fifthhorseman.net> Wed, 31 May 2017 12:44:38 -0400
+
runit (2.1.2-9.1) unstable; urgency=medium
* non-maintainer upload
diff -Nru runit-2.1.2/debian/control runit-2.1.2/debian/control
--- runit-2.1.2/debian/control 2017-05-28 15:07:36.000000000 -0400
+++ runit-2.1.2/debian/control 2017-05-31 12:44:38.000000000 -0400
@@ -6,7 +6,6 @@
Homepage: http://smarden.org/runit/
Build-Depends: bash-completion,
debhelper (>= 9),
- dh-exec,
dh-systemd,
dh-runit (>= 1.6),
dh-buildinfo (>= 0.11+nmu1),
diff -Nru runit-2.1.2/debian/rules runit-2.1.2/debian/rules
--- runit-2.1.2/debian/rules 2017-05-28 15:08:57.000000000 -0400
+++ runit-2.1.2/debian/rules 2017-05-31 12:44:38.000000000 -0400
@@ -9,9 +9,6 @@
override_dh_systemd_enable:
dh_systemd_enable --name runit
-override_dh_installman-arch:
- dh_installman
-
override_dh_runit: runscripts/getty
dh_runit
diff -Nru runit-2.1.2/debian/runit.install runit-2.1.2/debian/runit.install
--- runit-2.1.2/debian/runit.install 2017-05-28 14:51:14.000000000 -0400
+++ runit-2.1.2/debian/runit.install 2017-05-31 12:44:38.000000000 -0400
@@ -8,7 +8,9 @@
runit-*/src/chpst /usr/bin
runit-*/src/runsvchdir /usr/sbin
runit-*/src/utmpset /usr/sbin
+runit-*/src/runit-init /sbin
+runit-*/src/runit /sbin
runit-*/etc/debian/1 /etc/runit
runit-*/etc/2 /etc/runit
-runit-*/etc/debian/3 /etc/runit
\ No newline at end of file
+runit-*/etc/debian/3 /etc/runit
diff -Nru runit-2.1.2/debian/runit.manpages runit-2.1.2/debian/runit.manpages
--- runit-2.1.2/debian/runit.manpages 2017-05-28 14:51:14.000000000 -0400
+++ runit-2.1.2/debian/runit.manpages 2017-05-31 12:40:18.000000000 -0400
@@ -5,4 +5,6 @@
runit-*/man/chpst.8
runit-*/man/runsvchdir.8
runit-*/man/utmpset.8
+runit-*/man/runit.8
+runit-*/man/runit-init.8
debian/contrib/update-service.8
signature.asc
Description: PGP signature
