diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2018-08-18 09:36:49 +0200 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2018-09-13 22:26:45 -0700 |
| commit | 098ff810778e35116ccc2ee37cf8912c3cb486c7 (patch) | |
| tree | 292450cabf85a038a1d47b57259d99b53ca72392 | |
| parent | remove redundant agetty settings (diff) | |
| download | livecd-tools-2.5.tar.gz livecd-tools-2.5.tar.bz2 livecd-tools-2.5.zip | |
ppc: Move the hvc0 console logic outside2.5
Make so also ppc64le is supported and allow to override its
configuration by specifying another console as kernel param.
| -rw-r--r-- | init.d/fixinittab | 20 |
1 files 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 |