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
commit1590c930d465c3657d057e5061f6770023d2074b (patch)
tree64776af6dd14820f6333874fe7499f1cb82136bc /livecd-functions.sh
parentAdded IBM OP720 thanks to dostrow. (diff)
downloadlivecd-tools-1590c930d465c3657d057e5061f6770023d2074b.tar.gz
livecd-tools-1590c930d465c3657d057e5061f6770023d2074b.tar.bz2
livecd-tools-1590c930d465c3657d057e5061f6770023d2074b.zip
Extend serial/tty support for udev devices.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@94 7bf51bff-881f-0410-a643-fba68b97345e
Diffstat (limited to 'livecd-functions.sh')
-rwxr-xr-xlivecd-functions.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/livecd-functions.sh b/livecd-functions.sh
index a7c988c..2f95dd3 100755
--- a/livecd-functions.sh
+++ b/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" ]