summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2008-12-17 22:47:22 +0000
committerDoug Goldstein <cardoe@gentoo.org>2008-12-17 22:47:22 +0000
commitb9d651dff4ab67847d8554e0e8d32dc6b0f37839 (patch)
tree20be88e17cc22b309afcc061ec7c45f6b2415dc4 /sys-apps/sysvinit
parentadd ~x86, bug #251256 (diff)
downloadgentoo-2-b9d651dff4ab67847d8554e0e8d32dc6b0f37839.tar.gz
gentoo-2-b9d651dff4ab67847d8554e0e8d32dc6b0f37839.tar.bz2
gentoo-2-b9d651dff4ab67847d8554e0e8d32dc6b0f37839.zip
resolve bug #246502. bump to have everyone update to this
(Portage version: 2.1.6.1/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'sys-apps/sysvinit')
-rw-r--r--sys-apps/sysvinit/ChangeLog9
-rw-r--r--sys-apps/sysvinit/files/inittab-2.86-r12 (renamed from sys-apps/sysvinit/files/inittab-2.86-r11)6
-rw-r--r--sys-apps/sysvinit/sysvinit-2.86-r12.ebuild (renamed from sys-apps/sysvinit/sysvinit-2.86-r11.ebuild)7
3 files changed, 13 insertions, 9 deletions
diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index 0387bc84a545..e14bdf49e7b8 100644
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/sysvinit
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.61 2008/12/05 23:51:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.62 2008/12/17 22:47:15 cardoe Exp $
+
+*sysvinit-2.86-r12 (17 Dec 2008)
+
+ 17 Dec 2008; Doug Goldstein <cardoe@gentoo.org> -files/inittab-2.86-r11,
+ +files/inittab-2.86-r12, -sysvinit-2.86-r11.ebuild,
+ +sysvinit-2.86-r12.ebuild:
+ resolve bug #246502. bump to have everyone update to this
*sysvinit-2.86-r11 (05 Dec 2008)
diff --git a/sys-apps/sysvinit/files/inittab-2.86-r11 b/sys-apps/sysvinit/files/inittab-2.86-r12
index 1be1624fdc10..7fb603243af4 100644
--- a/sys-apps/sysvinit/files/inittab-2.86-r11
+++ b/sys-apps/sysvinit/files/inittab-2.86-r12
@@ -9,7 +9,7 @@
# Modified by: Mike Frysinger, <vapier@gentoo.org>
# Modified by: Robin H. Johnson, <robbat2@gentoo.org>
#
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.86-r11,v 1.1 2008/12/05 23:51:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.86-r12,v 1.1 2008/12/17 22:47:22 cardoe Exp $
# Default runlevel.
id:3:initdefault:
@@ -32,8 +32,8 @@ l6r:6:wait:/sbin/reboot -dk
#z6:6:respawn:/sbin/sulogin
# Do not uncomment yet. Pending bug 246502
-#BL2#s0:S:wait:/sbin/rc single
-#BL2#s1:S:wait:/sbin/sulogin
+su0:S:wait:/sbin/rc single
+su1:S:wait:/sbin/sulogin
# TERMINALS
c1:12345:respawn:/sbin/agetty 38400 tty1 linux
diff --git a/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r12.ebuild
index e41ce18b6adf..fde345dedb86 100644
--- a/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.86-r12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r11.ebuild,v 1.1 2008/12/05 23:51:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r12.ebuild,v 1.1 2008/12/17 22:47:15 cardoe Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -36,7 +36,7 @@ src_unpack() {
# Mung inittab for specific architectures
cd "${WORKDIR}"
- cp "${FILESDIR}"/inittab-2.86-r11 inittab || die "cp inittab"
+ cp "${FILESDIR}"/inittab-2.86-r12 inittab || die "cp inittab"
local insert=""
use ppc && insert='#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux'
use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100'
@@ -55,9 +55,6 @@ src_unpack() {
inittab #121786
fi
[[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab
-
- # Ready for baselayout2/openrc-0.4.0, commented pending bug 246502
- #has_version =sys-apps/baselayout-2* && sed -i -e '/^#BL2#/s,^#BL2#,,g' inittab
}
src_compile() {