X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=a28b1f562cb9ddff57baf5fc979c0bbe9acfdab9;hp=7fff972e5cf37bdfc923d6a0ea4f50166b62a1ec;hb=a9ef28a9082b24866dcbd5769dcc6c51f09b4ec3;hpb=67efa5840cc5246ec2e31fcf645bad32e89ae285

diff --git a/autoconfig.functions b/autoconfig.functions
index 7fff972..a28b1f5 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -596,11 +596,7 @@ if checkbootparam 'console'; then
         local serial="$this"
         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 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
-        else
+        if echo $serial | grep -q ttyS ; then
           local option="${serial##*,}"
           # default (works for kvm & CO):
           local speed="115200,57600,38400,19200,9600,4800,2400,1200";
@@ -615,14 +611,14 @@ if checkbootparam 'console'; then
               2400*) speed=2400 ;;
               1200*) speed=1200 ;;
           esac
+          eindent
+            einfo "Activating console login on device ${device} with speed ${speed}."
+            local number="${device#ttyS}"
+            sed -i "/^T$number:/d;/^#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
         fi
-        eindent
-          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]*}"
@@ -1837,7 +1833,7 @@ config_netscript() {
 
   if get_remote_file ${CONFIG} ${SCRIPTFILE} ; then
     chmod +x ${SCRIPTFILE}
-    einfo "Running ${WHITE}${SCRIPTFILE}${NORMAL}:" && ${SCRIPTFILE} ; eend $?
+    einfo "Running ${WHITE}${SCRIPTFILE}${NORMAL}:" && NETSCRIPT=${CONFIG} ${SCRIPTFILE} ; eend $?
   fi
 
  fi