diff options
| author |   Tom Gall <tgall@gentoo.org> | 2005-04-08 03:21:30 +0000 |
|---|---|---|
| committer | Tom Gall <tgall@gentoo.org> | 2005-04-08 03:21:30 +0000 |
| commit | 298b23ebc8d462f4d98d335b7d2a2d432b5f5385 (patch) | |
| tree | 0c5cac688082edf08a1c13736a3a73dc00b6cefd /sys-apps | |
| parent | Marked stable on amd64. (diff) | |
| download | gentoo-2-298b23ebc8d462f4d98d335b7d2a2d432b5f5385.tar.gz gentoo-2-298b23ebc8d462f4d98d335b7d2a2d432b5f5385.tar.bz2 gentoo-2-298b23ebc8d462f4d98d335b7d2a2d432b5f5385.zip | |
downgrade hvc to use vt220, and add hvc when ppc64,ibm are on
(Portage version: 2.0.51-r15)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.9.4-r6.ebuild | 13 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch | 4 |
3 files changed, 19 insertions, 5 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index fbc364394305..6dcda92cd416 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,15 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.227 2005/04/02 00:24:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.228 2005/04/08 03:21:30 tgall Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup + 07 Apr 2005; Tom Gall <tgall@gentoo.org> + files/rc-scripts-1.4.16-livecd.patch, baselayout-1.9.4-r6.ebuild: + downgrade hvc0 from vt320 to vt220, add hvc to inittab on ppc64 when use ibm + use flag is on + *baselayout-1.11.10-r6 (01 Apr 2005) 01 Apr 2005; Roy Marples <uberlord@gentoo.org> diff --git a/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild b/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild index d24e556d0886..b7f072c2e576 100644 --- a/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild +++ b/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild,v 1.7 2005/04/01 14:09:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild,v 1.8 2005/04/08 03:21:30 tgall Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -59,13 +59,22 @@ src_unpack() { # Add serial console for arches that typically have it case ${ARCH} in - sparc|mips|hppa|alpha|ia64) + sparc|mips|hppa|alpha|ia64|ppc64) sed -i -e \ 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \ inittab || die ;; esac + # Add hvc console skeleton for ibm ppc64 types + if [ ${ARCH} == "ppc64" ]; then + if use ibm; then + sed -i -e \ + 's"# TERMINALS"# echo "# HVC CONSOLE\n#hvc:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt220" \n\n# TERMINALS"' \ + inittab || die + fi + fi + # # sysvinit setup # diff --git a/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch b/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch index 447ad34dbd29..36ffb6f1688d 100644 --- a/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch +++ b/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch @@ -48,7 +48,7 @@ diff -urN rc-scripts-1.4.16.orig/sbin/livecd-functions.sh rc-scripts-1.4.16/sbin + if [ -c "/dev/hvc/0" ] + then + ln -s /dev/hvc/0 /dev/hvc0 -+ echo "c0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab ++ echo "c0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt220" >> /etc/inittab + fi # The rest... else @@ -64,7 +64,7 @@ diff -urN rc-scripts-1.4.16.orig/sbin/livecd-functions.sh rc-scripts-1.4.16/sbin + if [ -c "/dev/hvc/0" ] + then + ln -s /dev/hvc/0 /dev/hvc0 -+ echo "c1:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab ++ echo "c1:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt220" >> /etc/inittab + else + echo "c1:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab + fi |