Update inittab to not spawn agetty for runlevel 1 (single mode), bug #66834.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 113 insertions, 15 deletions

diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index e850a8cd00ee..a735283a816c 100644
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/sysvinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.20 2005/07/10 18:16:48 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.21 2005/08/04 16:16:40 azarah Exp $
+
+*sysvinit-2.86-r1 (04 Aug 2005)
+
+  04 Aug 2005; Martin Schlemmer <azarah@gentoo.org> files/inittab,
+  +sysvinit-2.86-r1.ebuild:
+  Update inittab to not spawn agetty for runlevel 1 (single mode), bug #66834.
 
   10 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> sysvinit-2.86.ebuild:
   Add ibm use flag check for extra ttys on IBM hardware.
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index c413a280c519..fc76faf62b38 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,12 +1,24 @@
-MD5 e8128b4c1cc840fb95d9036f7a4b4404 ChangeLog 2843
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 4bb35af95759582d45324cdf3bc237b7 sysvinit-2.85-r1.ebuild 2545
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 cb1165247fe26db95505195995ecac1b sysvinit-2.86.ebuild 2501
+MD5 4bb35af95759582d45324cdf3bc237b7 sysvinit-2.85-r1.ebuild 2545
+MD5 a9df0cdf1323d426416ffd31228d611f ChangeLog 3050
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 322fc86dcd9b6307f84415f6a7db0772 sysvinit-2.86-r1.ebuild 2513
+MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86-r1 132
+MD5 b956965acd5408afa0a3937001b2d55e files/sysvinit-2.86-docs.patch 1899
+MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86 132
+MD5 180a4654bbd070b1264a440c753e6cc0 files/sysvinit-2.86-shutdown-usage.patch 235
 MD5 5f94105e0b503a39fda5fb65d885e16c files/2.86-gentoo.patch 641
+MD5 b3e11d2c99e3704e3b20ee8a64aaa04a files/inittab 1666
 MD5 3ba9251f1f4f0ae0dd30d682b28183dd files/2.86-selinux.patch 6525
 MD5 38c0059ecfaa1b09e59a75cc2780aa94 files/digest-sysvinit-2.85-r1 64
-MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86 132
-MD5 eb3296226618c9805517b4fca35c242e files/inittab 1672
 MD5 3c171d9c843284ce606663e4e6da26e9 files/sysvinit-2.85-selinux.patch 6448
-MD5 b956965acd5408afa0a3937001b2d55e files/sysvinit-2.86-docs.patch 1899
-MD5 180a4654bbd070b1264a440c753e6cc0 files/sysvinit-2.86-shutdown-usage.patch 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC8j+Q1ZcsMnZjRyIRAkuMAJ9PP3LowDEoNDul8Kgy14wsJNehrgCfXOtF
+8aL0s+SFX7Ucf9/f8VEX1cg=
+=1z9Z
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sysvinit/files/digest-sysvinit-2.86-r1 b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r1
new file mode 100644
index 000000000000..36e59eb1e93b
--- /dev/null
+++ b/sys-apps/sysvinit/files/digest-sysvinit-2.86-r1
@@ -0,0 +1,2 @@
+MD5 7d5d61c026122ab791ac04c8a84db967 sysvinit-2.86.tar.gz 99009
+MD5 650af823f937d386e81520b1741d4d45 sysvinit-2.86-kexec.patch 4139
diff --git a/sys-apps/sysvinit/files/inittab b/sys-apps/sysvinit/files/inittab
index ab1baf3da7c2..a817cecc03ff 100644
--- a/sys-apps/sysvinit/files/inittab
+++ b/sys-apps/sysvinit/files/inittab
@@ -7,7 +7,7 @@
 # Modified by:  Daniel Robbins, <drobbins@gentoo.org>
 # Modified by:  Martin Schlemmer, <azarah@gentoo.org>
 #
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab,v 1.2 2004/12/22 03:25:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab,v 1.3 2005/08/04 16:16:40 azarah Exp $
 
 # Default runlevel.
 id:3:initdefault:
@@ -28,12 +28,12 @@ l6:6:wait:/sbin/rc reboot
 #z6:6:respawn:/sbin/sulogin
 
 # TERMINALS
-c1:12345:respawn:/sbin/agetty 38400 tty1 linux
-c2:12345:respawn:/sbin/agetty 38400 tty2 linux
-c3:12345:respawn:/sbin/agetty 38400 tty3 linux
-c4:12345:respawn:/sbin/agetty 38400 tty4 linux
-c5:12345:respawn:/sbin/agetty 38400 tty5 linux
-c6:12345:respawn:/sbin/agetty 38400 tty6 linux
+c1:2345:respawn:/sbin/agetty 38400 tty1 linux
+c2:2345:respawn:/sbin/agetty 38400 tty2 linux
+c3:2345:respawn:/sbin/agetty 38400 tty3 linux
+c4:2345:respawn:/sbin/agetty 38400 tty4 linux
+c5:2345:respawn:/sbin/agetty 38400 tty5 linux
+c6:2345:respawn:/sbin/agetty 38400 tty6 linux
 
 # SERIAL CONSOLES
 #s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
diff --git a/sys-apps/sysvinit/sysvinit-2.86-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r1.ebuild
new file mode 100644
index 000000000000..b84f8267c8c0
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.86-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r1.ebuild,v 1.1 2005/08/04 16:16:40 azarah Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
+SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz
+	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz
+	http://www.gc-linux.org/down/isobel/kexec/sysvinit/sysvinit-2.86-kexec.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux bootstrap build ibm static"
+
+RDEPEND="selinux? ( >=sys-libs/libselinux-1.18 sys-libs/libsepol )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-docs.patch
+	epatch "${FILESDIR}"/${P}-shutdown-usage.patch
+	epatch "${DISTDIR}"/sysvinit-2.86-kexec.patch
+	cd src
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	use selinux && epatch "${FILESDIR}"/${PV}-selinux.patch
+	cp "${FILESDIR}"/inittab "${WORKDIR}"/ || die "cp inittab"
+
+	if use ibm ; then
+		cat <<-EOF >> "${WORKDIR}"/inittab
+		#HVC / HVSI CONSOLE
+		#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0
+		#hvsi:2345:respawn:/sbin/agetty -L	19200 hvsi0
+		EOF
+	fi
+}
+
+src_compile() {
+	use static && append-ldflags -static
+
+	# Note: The LCRYPT define below overrides the test in
+	# sysvinit's Makefile.  This is because sulogin must be linked
+	# to libcrypt in any case, but when building stage2 in
+	# catalyst, /usr/lib/libcrypt.a isn't available.  In truth
+	# this doesn't change how sulogin is built since ld would use
+	# the shared obj by default anyway!  The other option is to
+	# refrain from building sulogin, but that isn't a good option.
+	# (09 Jul 2004 agriffis)
+	emake -C src \
+		CC="$(tc-getCC)" \
+		DISTRO="Gentoo" \
+		LCRYPT="-lcrypt" \
+		|| die
+}
+
+src_install() {
+	dodoc README doc/*
+
+	cd src
+	make install DISTRO="Gentoo" ROOT="${D}" || die "make install"
+
+	insinto /etc
+	doins "${WORKDIR}"/inittab || die "inittab"
+}
+
+pkg_postinst() {
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
+		# Do not return an error if this fails
+		/sbin/init U &>/dev/null
+	fi
+}