summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-01-26 22:47:21 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-01-26 22:47:21 +0000
commitf925e5265e508d05ad51c9e90252a98aede4d5f1 (patch)
tree61c7ee2dc09c016e690aae8403e5f2a735ad7da3 /src/livecd-tools
parent#gentoo-IA-64 -> #gentoo-IA64. (diff)
downloadgentoo-f925e5265e508d05ad51c9e90252a98aede4d5f1.tar.gz
gentoo-f925e5265e508d05ad51c9e90252a98aede4d5f1.tar.bz2
gentoo-f925e5265e508d05ad51c9e90252a98aede4d5f1.zip
Extend serial/tty support for udev devices.
Diffstat (limited to 'src/livecd-tools')
-rw-r--r--src/livecd-tools/livecd-functions.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/livecd-tools/livecd-functions.sh b/src/livecd-tools/livecd-functions.sh
index a7c988cab1..2f95dd30c8 100644
--- a/src/livecd-tools/livecd-functions.sh
+++ b/src/livecd-tools/livecd-functions.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/livecd-tools/livecd-functions.sh,v 1.17 2005/12/12 19:11:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/livecd-tools/livecd-functions.sh,v 1.18 2006/01/26 22:47:21 wolf31o2 Exp $
# Global Variables:
# CDBOOT -- is booting off CD
@@ -362,6 +362,7 @@ livecd_fix_inittab() {
# Comment out current getty settings
sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab
+ sed -i -e '/^s[01]/ s/^/#/' /etc/inittab
# SPARC & HPPA console magic
if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}" = "ppc64" ]
@@ -386,7 +387,7 @@ livecd_fix_inittab() {
echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
fi
# FB / STI console
- if [ -c "/dev/vc/1" ]
+ if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
then
MODEL_NAME=$(cat /proc/cpuinfo |grep "model name"|sed 's/.*: //')
if [ "${MODEL_NAME}" = "UML" ]