commit: 098ff810778e35116ccc2ee37cf8912c3cb486c7
Author: Luca Barbato <lu_zero <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 07:36:49 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 05:26:45 2018 +0000
URL: https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=098ff810
ppc: Move the hvc0 console logic outside
Make so also ppc64le is supported and allow to override its
configuration by specifying another console as kernel param.
init.d/fixinittab | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/init.d/fixinittab b/init.d/fixinittab
index de3a12f..4491217 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -31,7 +31,7 @@ start()
sed -i -e '/^b0/ s/^/#/' /etc/inittab
# SPARC & HPPA console magic
- if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}"
= "ppc64" ]
+ if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" ]
then
# Mount openprom tree for user debugging purposes
if [ "${HOSTTYPE}" = "sparc" ]
@@ -69,15 +69,6 @@ start()
done
fi
fi
- if [ -c "/dev/hvc0" ]
- then
- eindent
- ebegin "Adding hvc console to inittab ..."
- echo "s0:12345:respawn:/sbin/agetty -a root 9600 hvc0
vt320" >> /etc/inittab
- eend $?
- eoutdent
- fi
-
# The rest...
else
if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ]
@@ -103,6 +94,15 @@ start()
fi
fi
+ if [ -c "/dev/hvc0" -a "${LIVECD_CONSOLE}" = "" ]
+ then
+ eindent
+ ebegin "Adding hvc console to inittab ..."
+ echo "s0:12345:respawn:/sbin/agetty -a root 9600 hvc0 vt320" >>
/etc/inittab
+ eend $?
+ eoutdent
+ fi
+
# EFI-based machines should automatically hook up their console lines
if dmesg | grep -q '^Adding console on'
then
