Your message dated Mon, 21 Apr 2014 09:41:13 +0000
with message-id <[email protected]>
and subject line Bug#745260: fixed in sysvinit 2.88dsf-55
has caused the Debian Bug report #745260,
regarding sysvinit: Please fix hurd-console addition to inittab on Hurd
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
745260: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745260
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: sysvinit
Version: 2.88dsf-53
Severity: wishlist
Tags: patch

On hurd, attached patch fixes hurd-console addition to inittab if inittab file
is already present and fixes /libexec/getty replacement in commented out lines
as well.

Thanks for considering.
commit c7eb1326cf1bfb930298a13cb30a5e4902ead65d
Author: Gabriele Giacone <[email protected]>
Date:   Tue Apr 1 10:54:01 2014 +0200

    Fix hurd-console addition and getty pathnames in inittab [hurd].

diff --git a/debian/changelog b/debian/changelog
index d3ba717..86a90a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sysvinit (2.88dsf-55) UNRELEASED; urgency=medium
+
+  * sysv-rc:
+    - [hurd] Fix hurd-console addition to inittab if inittab already existent.
+    - [hurd] Replace /libexec/getty in commented out lines as well.
+
+ -- Gabriele Giacone <[email protected]>  Mon, 07 Apr 2014 12:59:55 +0200
+
 sysvinit (2.88dsf-54) experimental; urgency=medium
 
   [ Justus Winter ]
diff --git a/debian/sysvinit-core.config b/debian/sysvinit-core.config
index ce34f63..a828037 100755
--- a/debian/sysvinit-core.config
+++ b/debian/sysvinit-core.config
@@ -22,7 +22,8 @@ case "$1" in
 		| md5sum --status --check -; then
 		    # The file is unmodified, update it silently.
 		    :
-	    elif fgrep -q '/libexec/getty' /etc/inittab; then
+	    elif [ `fgrep -c -e '/libexec/getty' /etc/inittab` -gt 0 ] || \
+		[ `grep -c '^c:' /etc/inittab` -eq 0 ]; then
 		    db_input low sysvinit/hurd-fix-inittab || true
 		    db_go
 	    fi
diff --git a/debian/sysvinit-core.postinst b/debian/sysvinit-core.postinst
index d78fe86..44b6fba 100755
--- a/debian/sysvinit-core.postinst
+++ b/debian/sysvinit-core.postinst
@@ -86,15 +86,27 @@ rm -f /etc/ioctl.save
 if [ ! -f /etc/inittab ]
 then
 	cp -p /usr/share/sysvinit/inittab /etc/inittab
-elif [ "$(uname)" = GNU ] && fgrep -q '/libexec/getty' /etc/inittab; then
-	rm -f -- /etc/inittab.dpkg-new
-	sed -e '/^[^#]/ s|/libexec/getty|/sbin/getty|' \
-	    < /etc/inittab > /etc/inittab.dpkg-new
-
-	db_get sysvinit/hurd-fix-inittab
-	if [ "${RET}" = "true" ]; then
-		mv -- /etc/inittab /etc/inittab.dpkg-old
-		mv -- /etc/inittab.dpkg-new /etc/inittab
+elif [ "$(uname)" = GNU ]; then
+	ITAB=/etc/inittab
+	ITABNEW=${ITAB}.dpkg-new
+	cp $ITAB $ITABNEW
+	if fgrep -q '/libexec/getty' $ITABNEW; then
+		sed -e 's|/libexec/getty|/sbin/getty|' \
+		    -i $ITABNEW
+	fi
+	if ! grep -q '^c:' $ITABNEW; then
+		sed -e '/^6:/a c:23:respawn:/sbin/getty 38400 console' \
+		    -i $ITABNEW
+	fi
+
+	if ! diff $ITAB $ITABNEW >/dev/null; then
+	    db_get sysvinit/hurd-fix-inittab
+	    if [ "${RET}" = "true" ]; then
+		    mv -- $ITAB ${ITAB}.dpkg-old
+		    mv -- $ITABNEW $ITAB
+	    fi
+	else
+	    rm -f -- $ITABNEW
 	fi
 fi
 
diff --git a/debian/sysvinit-core.templates b/debian/sysvinit-core.templates
index 06c693c..759bbff 100644
--- a/debian/sysvinit-core.templates
+++ b/debian/sysvinit-core.templates
@@ -1,14 +1,14 @@
 Template: sysvinit/hurd-fix-inittab
 Type: boolean
-_Description: Update getty file names in /etc/inittab?
- Your /etc/inittab seems to use /libexec/getty as getty. The default
- inittab has been changed, however your /etc/inittab has been
- modified. Note that sysvinit has never been used to boot an Hurd
- system, so any errors in that file would not have shown up.
+_Description: Update getty pathnames and add hurd-console?
+ Your /etc/inittab seems to use /libexec/getty as getty and/or to miss
+ hurd-console entry. The default inittab has been changed, however your
+ /etc/inittab has been modified. Note that sysvinit has never been used
+ to boot an Hurd system, so any errors in that file would not have shown
+ up.
  .
- If you want to change /etc/inittab to use /sbin/getty as getty, choose
- yes. If you choose yes, a backup will be stored in /etc/inittab.dpkg-old.
+ If you allow this change, a backup will be stored in /etc/inittab.dpkg-old.
  .
- If you choose no, an updated inittab will be written to
+ If you don't allow this change, an updated inittab will be written to
  /etc/inittab.dpkg-new. Please review the changes and update your
  /etc/inittab accordingly.

--- End Message ---
--- Begin Message ---
Source: sysvinit
Source-Version: 2.88dsf-55

We believe that the bug you reported is fixed in the latest version of
sysvinit, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Petter Reinholdtsen <[email protected]> (supplier of updated sysvinit package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Mon, 21 Apr 2014 10:12:00 +0200
Source: sysvinit
Binary: sysvinit sysvinit-core sysvinit-utils sysv-rc initscripts bootlogd
Architecture: source amd64 all
Version: 2.88dsf-55
Distribution: experimental
Urgency: medium
Maintainer: Debian sysvinit maintainers 
<[email protected]>
Changed-By: Petter Reinholdtsen <[email protected]>
Description: 
 bootlogd   - daemon to log boot messages
 initscripts - scripts for initializing and shutting down the system
 sysv-rc    - System-V-like runlevel change mechanism
 sysvinit   - System-V-like init utilities - metapackage
 sysvinit-core - System-V-like init utilities
 sysvinit-utils - System-V-like utilities
Closes: 641669 720584 745260
Changes: 
 sysvinit (2.88dsf-55) experimental; urgency=medium
 .
   [ Gabriele Giacone ]
   * sysv-rc:
     - On hurd, fix hurd-console addition to inittab if inittab is already
       existent and fix getty pathnames in commented out lines as well
       (Closes: #745260).
 .
   [ Petter Reinholdtsen ]
   * Drop sysv-rc-conf as suggests.  It do not work with dependency based
     boot ordering.
   * Adjust initscripts.postinst to use --compare-versions checks that
     cause relevant code to only run on upgrades, and not on first time
     install, fixing debootstrap fakechroot failure (Closes: #720584).
     Patch from Andreas Mohr.
   * Add 'status' support to all init.d scripts (Closes: #641669).
     Based on patch from Peter Eisentraut.
Checksums-Sha1: 
 e293582d9972ca5c9b49ef6d89d79b9df2bbdce6 1781 sysvinit_2.88dsf-55.dsc
 7abfc6e994874b8e3e1ac26cfac0a68b650d3ab9 149320 
sysvinit_2.88dsf-55.debian.tar.xz
 f8556e0f8027744ba0d77537fe0d328516528305 82768 sysvinit_2.88dsf-55_amd64.deb
 c9b2cda8f3fbabf542face9c82f4d799bb613387 130224 
sysvinit-core_2.88dsf-55_amd64.deb
 449c53f26f7f503234f868d6033e5708ce5cbd90 83102 
sysvinit-utils_2.88dsf-55_amd64.deb
 546edf97295f8b8d0a535627c123f3c9642a8db0 81614 sysv-rc_2.88dsf-55_all.deb
 7dc91090663aed5ea97046a714c5efa63388a3a6 85796 initscripts_2.88dsf-55_amd64.deb
 af5f950f1ae818ec4c4dbd922683b92309b8c6a9 57914 bootlogd_2.88dsf-55_amd64.deb
Checksums-Sha256: 
 ccd1b39346397ffc7051daefdabe4efe5d6b4ca0d5c2c2e8e2d3232310f5c111 1781 
sysvinit_2.88dsf-55.dsc
 589245ebebe6f61d758a7b5a08b6f263d0267aa9c2f4f0da62453d49bbe8821e 149320 
sysvinit_2.88dsf-55.debian.tar.xz
 ce3e111159a2b6aaa37ec2a84a53abf3f640bf0a7963b0ff556e23edb034860d 82768 
sysvinit_2.88dsf-55_amd64.deb
 809bbc35c9f3413164d7edad0ad9e9f224dcc70e42d56f16b190192e0e64c35b 130224 
sysvinit-core_2.88dsf-55_amd64.deb
 055602fc01fe50ebf7b337e61e454ac0311b5cf6344c9458fc367304ba336f5c 83102 
sysvinit-utils_2.88dsf-55_amd64.deb
 4a59be2f7edcaa66728efe0f1345f63cdaf109d1f4199f7def7c6b19deacea87 81614 
sysv-rc_2.88dsf-55_all.deb
 d95cc2a88c676097bdfc794b938f07f97cf9ca8a7b7dc0830eb1c0659a6d6a9b 85796 
initscripts_2.88dsf-55_amd64.deb
 07ddd3ac56de57c6ecb61bf2318c90206d7dcb5b6ad479cc962548a666594f3d 57914 
bootlogd_2.88dsf-55_amd64.deb
Files: 
 29a09e9605fc772485132dff0aa4e9c0 1781 admin required sysvinit_2.88dsf-55.dsc
 4dbfab5a8b87b0fa13b5a3eebf6f1c48 149320 admin required 
sysvinit_2.88dsf-55.debian.tar.xz
 39e1281f5010c88f1b4a4591220901ce 82768 admin required 
sysvinit_2.88dsf-55_amd64.deb
 ff52ba2ea20a98b1b43454398a8bd624 130224 admin required 
sysvinit-core_2.88dsf-55_amd64.deb
 c89f8199948f5b94da96264e6116718f 83102 admin required 
sysvinit-utils_2.88dsf-55_amd64.deb
 6d05a7c9db67d42d852579e499e650fb 81614 admin required 
sysv-rc_2.88dsf-55_all.deb
 2c9903ff48445f0656fe366f3284b5c7 85796 admin required 
initscripts_2.88dsf-55_amd64.deb
 0454240492e20501933b49b6cb9ec684 57914 admin optional 
bootlogd_2.88dsf-55_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iD8DBQFTVNPP20zMSyow1ykRAqY6AKDiknKajVjo1tydLLeo7puW0gh2IgCfb4tX
a0C0ijYFqSLNPB/9S5j0hpc=
=0aW3
-----END PGP SIGNATURE-----

--- End Message ---
_______________________________________________
Pkg-sysvinit-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-sysvinit-devel

Reply via email to