Adam D. Barratt wrote:
> On Tue, 2011-01-11 at 22:08 +0000, Adam D. Barratt wrote:
>> I debated whether your second or third patch (i.e. trying to fix up the
>> debconf support, or removing it) was the way to go and would prefer to
>> simply revert the debconf use; if anyone sees any problems with this,
>> please yell (preferably loudly, and soon).
>
> Jonathan, do you already have packages prepared including these patches?
Now I do[1]. debdiff attached. (Seems to work.)
[1] http://mentors.debian.net/debian/pool/main/r/runit/runit_2.1.1-6.2.dsc
diff -u runit-2.1.1/debian/rules runit-2.1.1/debian/rules
--- runit-2.1.1/debian/rules
+++ runit-2.1.1/debian/rules
@@ -46,18 +46,13 @@
(cd runit/ && package/compile && package/check)
touch build-stamp
-po-templates: po-templates-stamp
-po-templates-stamp: deb-checkdir
- po2debconf debian/runit.templates.in >debian/runit.templates
- touch po-templates-stamp
-
clean: deb-checkdir deb-checkuid
rm -rf runit/compile runit/command
test ! -e patch-stamp || \
for i in `ls -1r debian/diff/*.diff || :`; do patch -p1 -R <$$i; done
- rm -f patch-stamp build-stamp po-templates-stamp
+ rm -f patch-stamp build-stamp
rm -rf '$(DIR)'
- rm -f debian/files debian/substvars changelog debian/runit.templates
+ rm -f debian/files debian/substvars changelog
test ! -r conf-cc'{orig}' || mv -f conf-cc'{orig}' runit/src/conf-cc
test ! -r conf-ld'{orig}' || mv -f conf-ld'{orig}' runit/src/conf-ld
rm -f runit
@@ -116,7 +111,7 @@
binary-indep:
-binary-arch: install po-templates runit.deb
+binary-arch: install runit.deb
test '$(CC)' != 'gcc' || \
dpkg-shlibdeps '$(DIR)'/usr/sbin/* '$(DIR)'/usr/bin/*
dpkg-gencontrol -isp -prunit -P'$(DIR)'
@@ -125,5 +120,5 @@
binary: binary-indep binary-arch
-.PHONY: patch build po-templates clean install binary-indep binary-arch binary
+.PHONY: patch build clean install binary-indep binary-arch binary
include debian/implicit
diff -u runit-2.1.1/debian/runit.README.Debian
runit-2.1.1/debian/runit.README.Debian
--- runit-2.1.1/debian/runit.README.Debian
+++ runit-2.1.1/debian/runit.README.Debian
@@ -7,7 +7,7 @@
The package does not replace the /sbin/init program, and so does not
enable runit to run as process no 1. To do so, you need to follow the
-documentation[0] or install the runit-run package.
+documentation[0].
runit's default directory for services is /etc/service/.
reverted:
--- runit-2.1.1/debian/runit.templates.in
+++ runit-2.1.1.orig/debian/runit.templates.in
@@ -1,11 +0,0 @@
-Template: runit/signalinit
-Type: boolean
-Default: true
-_Description: Signal the init process to enable service supervision?
- In order to enable the system-wide runit service supervision, an
- entry has been added to /etc/inittab, and the init process needs
- to be notified. In some environments, such as some vserver systems,
- sending a signal to the init process is not desired.
- .
- Note: If the init process is not notified, other packages that depend
- on runit might not properly start up the services they provide.
diff -u runit-2.1.1/debian/control runit-2.1.1/debian/control
--- runit-2.1.1/debian/control
+++ runit-2.1.1/debian/control
@@ -2,14 +2,15 @@
Section: admin
Priority: optional
Maintainer: Gerrit Pape <[email protected]>
-Build-Depends: dietlibc-dev (>> 0.28-0) [alpha amd64 arm hppa i386 ia64 mips
mipsel powerpc ppc64 s390 sparc], po-debconf
+Build-Depends: dietlibc-dev (>> 0.28-0) [alpha amd64 arm hppa i386 ia64 mips
mipsel powerpc ppc64 s390 sparc]
Standards-Version: 3.8.0.1
+Homepage: http://smarden.org/runit/
Package: runit
Architecture: any
Depends: procps, ${shlibs:Depends}
Recommends: fgetty
-Suggests: runit-run, socklog-run
+Suggests: socklog-run
Description: system-wide service supervision
runit is a collection of tools to provide system-wide service supervision
and to manage services. Contrary to sysv init, it not only cares about
@@ -21,5 +22,3 @@
- runit service supervision can run under sysv init, or replace the init
- system completely. Refer to the runit-run package for a complete init
- replacement.
- .
- See http://smarden.org/runit/ for more information.
+ runit service supervision can run under sysv init or replace the init
+ system completely. Complete init replacement requires some manual
+ configuration described in the supplied documentation.
diff -u runit-2.1.1/debian/changelog runit-2.1.1/debian/changelog
--- runit-2.1.1/debian/changelog
+++ runit-2.1.1/debian/changelog
@@ -1,3 +1,18 @@
+runit (2.1.1-6.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * remove option of suppressing HUP signal to process 1 (because it
+ causes upgrade failures: closes: #605912, reopens: #453106).
+ - debian/runit.config, debian/runit.templates.in: remove.
+ - debian/runit.postinst, debian/runit.postrm: signal process 1 if
+ and only if it is running (thx Adam D. Barratt).
+ - debian/rules: remove po-templates rules.
+ - debian/control: no longer Build-Depends: po-debconf.
+ * debian/control, debian/runit.README.Debian: remove vestiges of
+ the runit-run package.
+
+ -- Jonathan Nieder <[email protected]> Sun, 16 Jan 2011 13:26:58 -0600
+
runit (2.1.1-6.1) unstable; urgency=low
* Non-Maintainer Upload.
diff -u runit-2.1.1/debian/runit.postinst runit-2.1.1/debian/runit.postinst
--- runit-2.1.1/debian/runit.postinst
+++ runit-2.1.1/debian/runit.postinst
@@ -47,7 +47,9 @@
-if test -r /usr/share/debconf/confmodule; then
- . /usr/share/debconf/confmodule
- db_get runit/signalinit
- test "$RET" = false || kill -s HUP 1
-else
+if ps -p 1 >/dev/null; then
kill -s HUP 1
fi
+
+# remove lingering debconf-managed configuration
+# from versions 2.1.0-1 through 2.1.1-6.1.
+test -r /usr/share/debconf/confmodule || exit 0
+. /usr/share/debconf/confmodule
+db_purge
diff -u runit-2.1.1/debian/runit.postrm runit-2.1.1/debian/runit.postrm
--- runit-2.1.1/debian/runit.postrm
+++ runit-2.1.1/debian/runit.postrm
@@ -9,13 +9,18 @@
sed -e '/#-- runit begin/,/#-- runit end/d' \
</etc/inittab >/etc/inittab'{new}'
mv -f /etc/inittab'{new}' /etc/inittab
- kill -s HUP 1 || :
+ if ps -p 1 >/dev/null; then
+ kill -s HUP 1
+ fi
fi
test "$1" = 'purge' || exit 0
rm -rf /etc/sv/getty-5/supervise /var/run/sv.getty-5
test ! -h /var/service || rm -f /var/service
+
+# remove lingering debconf-managed configuration
+# from versions 2.1.0-1 through 2.1.1-6.1.
test -r /usr/share/debconf/confmodule || exit 0
. /usr/share/debconf/confmodule
db_purge
reverted:
--- runit-2.1.1/debian/runit.config
+++ runit-2.1.1.orig/debian/runit.config
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_version 2.0
-
-if test "$1" = configure && test -n "$2" &&
- dpkg --compare-versions "$2" le 2.0.0-1; then
- db_fset runit-run/install seen true
- exit 0
-fi
-
-if which ps >/dev/null 2>&1; then
- if ps -p 1 >/dev/null; then
- db_input low runit/signalinit || :
- else
- db_input high runit/signalinit || :
- fi
- db_go || :
-fi
