inittab: use getty instead of mgetty

diff --git a/debian/changelog b/debian/changelog
index 22ef260..c3079d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+grml-etc (1.1.33) unstable; urgency=low
+
+  * /etc/inittab*: Use normal getty instead of mgetty and several
+    baud rate settings to let getty figure out which mode should be
+    used. Use '#grmlserial#' to mark the beginng of the lines that
+    should be activated through grml-autoconfig when booting with
+    serial/console bootoption (providing more flexibility for the
+    user). Thanks to Zoran Dzelajlija for the detailled bugreport
+    and suggestions. [Closes: issue485]
+
+ -- Michael Prokop <mika@grml.org>  Sat, 27 Feb 2010 02:28:29 +0100
+
 grml-etc (1.1.32) unstable; urgency=low
 
   * Rework xinitrc handling: modularize the code into ~/.xinitrc.d/

diff --git a/etc/inittab.grml b/etc/inittab.grml
index 3a2f83b..39f5ae8 100644 (file)
--- a/etc/inittab.grml
+++ b/etc/inittab.grml
@@ -3,7 +3,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Okt 12 16:48:03 CEST 2006 [mika]
 ################################################################################
 
 # The default runlevel.
@@ -51,46 +50,34 @@ po::powerokwait:/etc/init.d/powerfail stop
 # Format:
 #  <id>:<runlevels>:<action>:<process>
 # 4 virtual consoles with immortal shells
-# 1:12345:respawn:/bin/zsh --login -c "/usr/bin/grml-start ; /usr/bin/grml-screen" >/dev/tty1 2>&1 </dev/tty1
-# 1:12345:respawn:/usr/bin/openvt -f -c 1 -w -- /usr/bin/zsh -l
+# Note that on most Debian systems tty7 is used by the X Window System.
+# Use tty8 a second xserver.
 1:12345:respawn:/sbin/rungetty tty1 --noclear -u root -g root --autologin root /usr/bin/zsh-login
 2:2345:respawn:/sbin/rungetty tty2 -u root -g root --autologin root /usr/bin/grml-init-screen
 3:2345:respawn:/sbin/rungetty tty3 -u root -g root --autologin root /usr/bin/grml-init-screen
 4:2345:respawn:/sbin/rungetty tty4 -u grml -g grml --autologin grml /usr/bin/grml-init
 5:2345:respawn:/sbin/rungetty tty5 -u grml -g grml --autologin grml /usr/bin/grml-init
 6:2345:respawn:/sbin/rungetty tty6 -u grml -g grml --autologin grml /usr/bin/grml-init
-# Note that on most Debian systems tty7 is used by the X Window System.
-# Use tty8 for a second xserver.
 9:2345:respawn:/sbin/getty  38400 tty9
 10:2345:respawn:/bin/zsh --login -c "/usr/sbin/grml-iptstate ; /usr/bin/grml-init-screen" >/dev/tty10 2>&1 </dev/tty10
 11:2345:respawn:/bin/zsh --login -c "/usr/bin/htop ; /usr/bin/grml-init-screen" >/dev/tty11 2>&1 </dev/tty11
-# running console-log on 12 already
-#12:2345:respawn:/bin/zsh --login -c "/usr/bin/less +F /var/log/syslog ; /usr/bin/grml-screen" >/dev/tty12 2>&1 </dev/tty12
 12:2345:respawn:/bin/zsh --login -c "/usr/bin/grml-init-multitail ; /usr/bin/grml-init-screen" >/dev/tty12 2>&1 </dev/tty12
 
-# Restart init with new configuration?
-# kill -1 1
-
-# Run gettys in standard runlevels
-#1:2345:respawn:/sbin/mingetty tty1
-#2:2345:respawn:/sbin/mingetty tty2
-#3:2345:respawn:/sbin/mingetty tty3
-#4:2345:respawn:/sbin/mingetty tty4
-#5:2345:respawn:/sbin/mingetty tty5
-#6:2345:respawn:/sbin/mingetty tty6
+################################################################################
+# Please do NOT remove the following lines as they are important for the
+# bootoption serial/console. All lines starting with "#grmlserial#" will be
+# activated then.
+#grmlserial#T0:23:respawn:/sbin/getty -L ttyS0 -l /usr/bin/zsh-login 115200,57600,38400,19200,9600,4800,2400,1200 vt100
+#grmlserial#T1:23:respawn:/sbin/getty -L ttyS1 -l /usr/bin/zsh-login 115200,57600,38400,19200,9600,4800,2400,1200 vt100
+################################################################################
 
 # Example how to put a getty on a serial line (for a terminal)
-#
 # T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100
 # T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100
-
-# Important! Please do not remove the following 2 lines as the are important for cheatcode serial:
-#T0:2345:respawn:/bin/bash -c "/sbin/mgetty ttyS0 || sleep 30"
-#T1:2345:respawn:/bin/bash -c "/sbin/mgetty ttyS1 || sleep 30"
-# Important! #####################################################################################
+# T0:2345:respawn:/bin/bash -c "/sbin/mgetty ttyS0 || sleep 30"
+# T1:2345:respawn:/bin/bash -c "/sbin/mgetty ttyS1 || sleep 30"
 
 # Example how to put a getty on a modem line.
-#
 #T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3
 
 #-- isdnutils begin
@@ -102,8 +89,10 @@ po::powerokwait:/etc/init.d/powerfail stop
 #I0:2345:respawn:/usr/sbin/vboxgetty -d /dev/ttyI0
 #I1:2345:respawn:/sbin/mgetty -D -m '"" ATZ OK AT&Eyourmsnhere OK AT&B512 OK' -s 38400 ttyI1
 #-- isdnutils end
+
 # Run X Window session from CDROM in runlevel 5
 #w5:5:wait:/bin/sleep 2
 #x5:5:wait:/etc/init.d/xsession start
+
 # Use line below to use secvpnmon. Use init q to reread inittab.
 # SVPN:2345:respawn:/usr/sbin/secvpnmon

diff --git a/etc/inittab.small b/etc/inittab.small
index b04d9fb..26b135c 100644 (file)
--- a/etc/inittab.small
+++ b/etc/inittab.small
@@ -3,7 +3,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Son Apr 15 13:10:36 CEST 2007 [mika]
 ################################################################################
 
 # The default runlevel.
@@ -50,31 +49,27 @@ po::powerokwait:/etc/init.d/powerfail stop
 #
 # Format:
 #  <id>:<runlevels>:<action>:<process>
+# 4 virtual consoles with immortal shells
+# Note that on most Debian systems tty7 is used by the X Window System.
+# Use tty8 a second xserver.
 1:12345:respawn:/sbin/rungetty tty1 --noclear -u root -g root --autologin root /usr/bin/zsh-login
 2:2345:respawn:/sbin/rungetty tty2 -u grml -g grml --autologin grml /usr/bin/grml-init
 3:2345:respawn:/sbin/rungetty tty3 -u grml -g grml --autologin grml /usr/bin/grml-init
-# 4:2345:respawn:/sbin/rungetty tty4 -u grml -g grml --autologin grml /usr/bin/grml-init
-# 5:2345:respawn:/sbin/rungetty tty5 -u grml -g grml --autologin grml /usr/bin/grml-init
-# 6:2345:respawn:/sbin/rungetty tty6 -u grml -g grml --autologin grml /usr/bin/grml-init
-# Note that on most Debian systems tty7 is used by the X Window System.
-# Use tty8 for a second xserver.
-# 9:2345:respawn:/sbin/getty  38400 tty9
-# 10:2345:respawn:/bin/zsh --login -c "/usr/sbin/grml-iptstate ; /usr/bin/grml-init-screen" >/dev/tty10 2>&1 </dev/tty10
-# 11:2345:respawn:/bin/zsh --login -c "/usr/bin/htop ; /usr/bin/grml-init-screen" >/dev/tty11 2>&1 </dev/tty11
-# running console-log on 12 already
-# 12:2345:respawn:/bin/zsh --login -c "/usr/bin/less +F /var/log/syslog ; /usr/bin/grml-screen" >/dev/tty12 2>&1 </dev/tty12
-# 12:2345:respawn:/bin/zsh --login -c "/usr/bin/multitail /var/log/syslog ; /usr/bin/grml-init-screen" >/dev/tty12 2>&1 </dev/tty12
-
-# Restart init with new configuration?
-# kill -1 1
-
-# Run gettys in standard runlevels
-#1:2345:respawn:/sbin/mingetty tty1
-#2:2345:respawn:/sbin/mingetty tty2
-#3:2345:respawn:/sbin/mingetty tty3
-#4:2345:respawn:/sbin/mingetty tty4
-#5:2345:respawn:/sbin/mingetty tty5
-#6:2345:respawn:/sbin/mingetty tty6
+#4:2345:respawn:/sbin/rungetty tty4 -u grml -g grml --autologin grml /usr/bin/grml-init
+#5:2345:respawn:/sbin/rungetty tty5 -u grml -g grml --autologin grml /usr/bin/grml-init
+#6:2345:respawn:/sbin/rungetty tty6 -u grml -g grml --autologin grml /usr/bin/grml-init
+#9:2345:respawn:/sbin/getty  38400 tty9
+#10:2345:respawn:/bin/zsh --login -c "/usr/sbin/grml-iptstate ; /usr/bin/grml-init-screen" >/dev/tty10 2>&1 </dev/tty10
+#11:2345:respawn:/bin/zsh --login -c "/usr/bin/htop ; /usr/bin/grml-init-screen" >/dev/tty11 2>&1 </dev/tty11
+#12:2345:respawn:/bin/zsh --login -c "/usr/bin/grml-init-multitail ; /usr/bin/grml-init-screen" >/dev/tty12 2>&1 </dev/tty12
+
+################################################################################
+# Please do NOT remove the following lines as they are important for the
+# bootoption serial/console. All lines starting with "#grmlserial#" will be
+# activated then.
+#grmlserial#T0:23:respawn:/sbin/getty -L ttyS0 -l /usr/bin/zsh-login 115200,57600,38400,19200,9600,4800,2400,1200 vt100
+#grmlserial#T1:23:respawn:/sbin/getty -L ttyS1 -l /usr/bin/zsh-login 115200,57600,38400,19200,9600,4800,2400,1200 vt100
+################################################################################
 
 # Example how to put a getty on a serial line (for a terminal)
 #
@@ -87,7 +82,6 @@ po::powerokwait:/etc/init.d/powerfail stop
 # Important! #####################################################################################
 
 # Example how to put a getty on a modem line.
-#
 #T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3
 
 #-- isdnutils begin
@@ -99,8 +93,10 @@ po::powerokwait:/etc/init.d/powerfail stop
 #I0:2345:respawn:/usr/sbin/vboxgetty -d /dev/ttyI0
 #I1:2345:respawn:/sbin/mgetty -D -m '"" ATZ OK AT&Eyourmsnhere OK AT&B512 OK' -s 38400 ttyI1
 #-- isdnutils end
+
 # Run X Window session from CDROM in runlevel 5
 #w5:5:wait:/bin/sleep 2
 #x5:5:wait:/etc/init.d/xsession start
+
 # Use line below to use secvpnmon. Use init q to reread inittab.
 # SVPN:2345:respawn:/usr/sbin/secvpnmon