Changeset 3051 in MondoRescue for branches/3.0/mindi

Timestamp:

Oct 19, 2012, 3:16:17 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix #649 by adding serial port detection in GetShell function which was harcoding the tty to use (Matthew Ross). Also update mindi's doc.

Location:

branches/3.0/mindi

Files:

• README.bootparam (modified) (1 diff)
• rootfs/etc/init.d/rcS (modified) (1 diff)

branches/3.0/mindi/README.bootparam

@@ -70 +70 @@
 
 serial=/dev/ttySx
-    When using a serial console, associate it to the tty device so it works correctly at restore time. By default set up /dev/ttyS0 as serial console. Pass the value of your serial console if different.
+    When using a serial console, associate it to the tty device so it works correctly at restore time. By default set up /dev/ttyS0 as serial console. Pass the value of your serial console if different. You may also want to pass console=ttySx so your kernel can deal with it. serial takes precedence over console for mindi.
 
 textonly

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

@@ -53 +53 @@
     mount / -o rw,remount > /dev/null 2> /dev/null
     LogIt "Launching Shell"
-    setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+    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
 }