diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-04-20 03:51:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-04-20 03:51:26 +0000 |
| commit | e0bc2ab031b31c848ab50afe14b5eb50cea76e57 (patch) | |
| tree | b9363627a5fe24ee05fb35a0bafae5f45a5aa9b2 /sys-apps/sysvinit | |
| parent | Add missing call to toolchain_pkg_postinst so gcc-config and friends kick in ... (diff) | |
| download | gentoo-2-e0bc2ab031b31c848ab50afe14b5eb50cea76e57.tar.gz gentoo-2-e0bc2ab031b31c848ab50afe14b5eb50cea76e57.tar.bz2 gentoo-2-e0bc2ab031b31c848ab50afe14b5eb50cea76e57.zip | |
Deploy -L by default on serial ports, and cleanup arch inittab stuff as arrays #466494 by Markos Chandras.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-apps/sysvinit')
| -rw-r--r-- | sys-apps/sysvinit/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/sysvinit/files/inittab-2.87 | 7 | ||||
| -rw-r--r-- | sys-apps/sysvinit/sysvinit-2.88-r4.ebuild | 22 |
3 files changed, 22 insertions, 14 deletions
diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog index af4ccf86ffb3..768013764c0d 100644 --- a/sys-apps/sysvinit/ChangeLog +++ b/sys-apps/sysvinit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/sysvinit # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.121 2013/03/23 08:50:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.122 2013/04/20 03:51:26 vapier Exp $ + + 20 Apr 2013; Mike Frysinger <vapier@gentoo.org> files/inittab-2.87, + sysvinit-2.88-r4.ebuild: + Deploy -L by default on serial ports, and cleanup arch inittab stuff as arrays + #466494 by Markos Chandras. 23 Mar 2013; Mike Frysinger <vapier@gentoo.org> sysvinit-2.88-r4.ebuild: Mark m68k stable #458226. diff --git a/sys-apps/sysvinit/files/inittab-2.87 b/sys-apps/sysvinit/files/inittab-2.87 index a6a04f371629..cf07548117c2 100644 --- a/sys-apps/sysvinit/files/inittab-2.87 +++ b/sys-apps/sysvinit/files/inittab-2.87 @@ -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.87,v 1.1 2010/01/08 16:55:07 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $ # Default runlevel. id:3:initdefault: @@ -44,8 +44,8 @@ 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 -#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100 +#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 # What to do at the "Three Finger Salute". ca:12345:ctrlaltdel:/sbin/shutdown -r now @@ -56,4 +56,3 @@ ca:12345:ctrlaltdel:/sbin/shutdown -r now # extra at boot if /etc/init.d/xdm is not added # to the "default" runlevel. x:a:once:/etc/X11/startDM.sh - diff --git a/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild index 49bbea30ddd7..727608edaa72 100644 --- a/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild,v 1.13 2013/03/23 08:50:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild,v 1.14 2013/04/20 03:51:26 vapier Exp $ EAPI="4" @@ -38,14 +38,16 @@ src_prepare() { # Mung inittab for specific architectures cd "${WORKDIR}" cp "${FILESDIR}"/inittab-2.87 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' - use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' - use s390 && insert='s0:12345:respawn:/sbin/agetty 38400 console' + local insert=() + use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) + use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) + use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) + use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console' ) if use ibm ; then - insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n' - insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0" + insert+=( + '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' + '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' + ) fi (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab if use kernel_FreeBSD ; then @@ -60,7 +62,9 @@ src_prepare() { -e '/ttyS[01]/s:9600:115200:' \ inittab fi - [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab + if [[ ${#insert[@]} -gt 0 ]] ; then + printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab + fi } src_compile() { |