From: Michael Prokop <mika@grml.org>
Date: Wed, 21 Jul 2010 21:21:01 +0000 (+0200)
Subject: console setup: provide fallback if no tty was specified, fix minor whitespace/tab... 
X-Git-Tag: v0.9.12~2
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=3a046cd995c177b4d69ac505caf0890be2870b80

console setup: provide fallback if no tty was specified, fix minor whitespace/tab/typo issues

Signed-off-by: Michael Prokop <mika@grml.org>
---

diff --git a/autoconfig.functions b/autoconfig.functions
index b75f648..97d45cd 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -574,11 +574,11 @@ fi
 
 # activate serial console {{{
 config_console(){
-local line
-local ws
-ws='	 '
-
 if checkbootparam 'console'; then
+  local line
+  local ws
+  ws='	 '
+
   einfo "Bootoption for serial console detected:"
 
   line="$CMDLINE x "
@@ -589,12 +589,12 @@ if checkbootparam 'console'; then
     case "$this" in
       console=*)
         local serial="$this"
-	local device="${this%%,*}"
-	local device="${device##*=}"
+        local device="${this%%,*}"
+        local device="${device##*=}"
         if ! echo $serial | grep -q ttyS ; then
-          ewarn "Warning: console=ttyS... not specified as last console= option. Falling back to defaults."
+          ewarn "Warning: console=ttyS... not specified as last console= option. Falling back to set up ttyS0/9600."
+          sed -i "/^#grmlserial#/iT0:23:respawn:/bin/bash -c \"/sbin/getty -L /dev/ttyS0 -l /usr/bin/zsh-login 9600 vt100 || sleep 30\"" /etc/inittab
           eend 0
-          local speed="9600"
         else
           local option="${serial##*,}"
           # default (works for kvm & CO):
@@ -612,18 +612,18 @@ if checkbootparam 'console'; then
           esac
         fi
         eindent
-          einfo "Activting console login on device ${device} with speed ${speed}."
-	  local number="${device#ttyS}"
-	  local inittab=../inittab
-          sed -i "/#grmlserial#/iT$number:23:respawn:/bin/bash -c \"/sbin/getty -L $device -l /usr/bin/zsh-login $speed vt100 || sleep 30\"" $inittab ;  eend $?
-	  telinitq="1"
+          einfo "Activating console login on device ${device} with speed ${speed}."
+          local number="${device#ttyS}"
+          sed -i "/^#grmlserial#/iT$number:23:respawn:/bin/bash -c \"/sbin/getty -L $device -l /usr/bin/zsh-login $speed vt100 || sleep 30\"" /etc/inittab
+          eend $?
+          telinitq="1"
         eoutdent
         ;;
     esac
     this="${line%%[$ws]*}"
     line="${line#*[$ws]}"
-  done 
-  
+  done
+
   if [ -n "$telinitq" ]; then
     /sbin/telinit q
   fi