Jonathan Nieder wrote: > possible fix for that. postrm is still a bit broken > (it will print an error message if init is not running and does not > respect the user choice expressed in runit/signalinit).
... part 3 is to remove support for the runit/signalinit choice in squeeze, since (1) it was added after lenny and (2) it is clearly not cooked yet. If someone wants to revive and help maintain such support for wheezy, I imagine that would be welcome and appreciated. Signed-off-by: Jonathan Nieder <jrnie...@gmail.com> --- Still untested. But maybe it will work now. :) debian/changelog | 14 ++++++++++---- debian/control | 2 +- debian/rules | 13 ++++--------- debian/runit.config | 11 ----------- debian/runit.postinst | 14 +++++++------- debian/runit.postrm | 7 ++++++- debian/runit.templates.in | 11 ----------- 7 files changed, 28 insertions(+), 44 deletions(-) delete mode 100644 debian/runit.config delete mode 100644 debian/runit.templates.in diff --git a/debian/changelog b/debian/changelog index b478dfb..18bd486 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ runit (2.1.1-6.1.1) local; urgency=low - * debian/control, debian/runit.README.Debian, debian/runit.config: - remove vestiges of the runit-run package (closes: #605912). - * debian/runit.config, debian/runit.postinst: do not ask to signal - init if init is not running. + * 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 <jrnie...@gmail.com> Sat, 08 Jan 2011 13:39:05 -0600 diff --git a/debian/control b/debian/control index e64699c..ef914ec 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: runit Section: admin Priority: optional Maintainer: Gerrit Pape <p...@smarden.org> -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/ diff --git a/debian/rules b/debian/rules index c1f8c89..7a437c7 100755 --- a/debian/rules +++ b/debian/rules @@ -46,18 +46,13 @@ build-stamp: patch-stamp (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 @@ install: deb-checkdir deb-checkuid build-stamp 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)' @@ -124,6 +119,6 @@ binary-arch: install po-templates runit.deb 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 --git a/debian/runit.config b/debian/runit.config deleted file mode 100644 index 2183213..0000000 --- a/debian/runit.config +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -. /usr/share/debconf/confmodule - -db_version 2.0 - -if which ps >/dev/null 2>&1 && ps -p 1 >/dev/null; then - db_input low runit/signalinit || : - db_go || : -fi diff --git a/debian/runit.postinst b/debian/runit.postinst index a78af57..05816dc 100644 --- a/debian/runit.postinst +++ b/debian/runit.postinst @@ -45,11 +45,11 @@ if ! grep '^SV:' /etc/inittab >/dev/null; then fi if ps -p 1 >/dev/null; then - if test -r /usr/share/debconf/confmodule; then - . /usr/share/debconf/confmodule - db_get runit/signalinit - test "$RET" = false || kill -s HUP 1 - else - kill -s HUP 1 - fi + 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 --git a/debian/runit.postrm b/debian/runit.postrm index d4002f9..c2666b9 100644 --- a/debian/runit.postrm +++ b/debian/runit.postrm @@ -9,13 +9,18 @@ if grep '#-- runit begin' /etc/inittab >/dev/null; then 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 diff --git a/debian/runit.templates.in b/debian/runit.templates.in deleted file mode 100644 index 19323d0..0000000 --- a/debian/runit.templates.in +++ /dev/null @@ -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. -- 1.7.4.rc1 -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
