Adam D. Barratt wrote:

> Thanks for looking at this bug.  I think the patch you've suggested is
> the wrong solution, however.
>
> As runit-run no longer exists after lenny, I think removing the
> entire block of code would be a better solution.

I agree.

> In terms of the second part of the patch, the package's use of debconf
> looks a little odd.  There is one template, which says "can I signal
> init to restart?".  Previously, the signalling was performed without
> asking, which broke in environments where there was no such process,
> such as vservers (see #542593).  The implemented solution asks this
> question at low priority if an init process is found, and high priority
> if not; in both cases the default is "yes", which does not seem to make
> much sense in the case where it has already been determined that there
> is no such process.

I think the idea was to allow installation without starting services
immediately, as requested in #453106.  I agree that this is broken
somewhat:

 - if debconf is not installed and no init process is present,
   postinst fails;
 - there should be no debconf prompt at all, not a high priority one,
   when no init process is present (as you mentioned).

> It's possible that I simply need more coffee, but it may make more sense
> to simply rip the debconf use back out, and have the postinst signal
> init based simply on the existence of an init process.

Here's a patch ignoring that issue, that just goes after the nominal
subject of the bug (the easy part).  Untested.

-- 8< --
Subject: remove vestiges of the runit-run package

Upgrades from lenny are failing because of a missing template
from the runit-run package.

While fixing that, tweak the description, dependencies, and
README.Debian to stop mentioning that now nonexistent package (and use
a Homepage: field in debian/control instead of text pointing to the
web page for simplicity).

Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
 debian/changelog           |    7 +++++++
 debian/control             |   11 +++++------
 debian/runit.README.Debian |    2 +-
 debian/runit.config        |    6 ------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c81a83..47130f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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).
+
+ -- Jonathan Nieder <jrnie...@gmail.com>  Sat, 08 Jan 2011 13:39:05 -0600
+
 runit (2.1.1-6.1) unstable; urgency=low
 
   * Non-Maintainer Upload.
diff --git a/debian/control b/debian/control
index 2098d2d..e64699c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,13 @@ 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
 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
@@ -18,8 +19,6 @@ Description: system-wide service supervision
  interface to send signals to service daemons without the need for pid-files,
  and a log facility with automatic log file rotation and disk space limits.
  .
- 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 --git a/debian/runit.README.Debian b/debian/runit.README.Debian
index 5ffb19e..6249aa9 100644
--- a/debian/runit.README.Debian
+++ b/debian/runit.README.Debian
@@ -7,7 +7,7 @@ service supervision on systems running sysvinit as init scheme.
 
 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/.
 
diff --git a/debian/runit.config b/debian/runit.config
index f23d62d..e6ed1ba 100644
--- a/debian/runit.config
+++ b/debian/runit.config
@@ -5,12 +5,6 @@ set -e
 
 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 || :
-- 
1.7.4.rc1




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to