Changeset 3244 in MondoRescue

Timestamp:

Jan 30, 2014, 11:13:12 PM (11 years ago)

Author:

Bruno Cornec

Message:

• apply patch made on r3200/3.2 branch to 3.0 (Fix serial console detection where using -f is not working. Use -e to test the file instead)

File:

• branches/3.0/mindi/rootfs/etc/init.d/rcS (modified) (2 diffs)

branches/3.0/mindi/rootfs/etc/init.d/rcS

@@ -53 +53 @@
     mount / -o rw,remount > /dev/null 2> /dev/null
     for i in `cat /proc/cmdline`; do
-        echo $i | grep -qi console= && console=`echo $i | cut -d= -f2`
-        echo $i | grep -qi serial= && serial=`echo $i | cut -d= -f2`
-    done
-    LogIt "Launching Shell"
-    if [[ $serial != "" && -e $serial ]]; then
-        setsid sh -c "exec sh <$serial >$serial 2>&1"
-    elif [[ $console != "" && -e $console ]]; then
-        setsid sh -c "exec sh <$console >$console 2>&1"
-    else
-        setsid sh -c "exec sh </dev/tty1 >/dev/tty1 2>&1"
-    fi
+        echo $i | grep -qi console= && console=`echo $i | cut -d= -f2`
+        echo $i | grep -qi serial= && serial=`echo $i | cut -d= -f2`
+    done
+    LogIt "Launching Shell"
+    if [[ $serial != "" && -e $serial ]]; then
+        setsid sh -c "exec sh <$serial >$serial 2>&1"
+    elif [[ $console != "" && -e /dev/$console ]]; then
+        setsid sh -c "exec sh </dev/$console >/dev/$console 2>&1"
+    else
+        setsid sh -c "exec sh </dev/tty1 >/dev/tty1 2>&1"
+    fi
 }
 
@@ -111 +111 @@
     # Required to have a correct serial console support (MP on ia64 or VSP with iLO2 e.g.)
     for i in `cat /proc/cmdline` ; do
-        echo $i | grep -qi serial= && serial=`echo $i | cut -d= -f2`
+        echo $i | grep -qi serial= && serial=`echo $i | cut -d= -f2`
     done
     # Doing that is only valid when using a real serial line
-    if [ -f $serial ]; then
+    if [[ $serial != "" && -e $serial ]]; then
         LogIt "Redirecting serial $serial to /dev/tty" 1
         ln -s -f $serial /dev/tty