Changeset 2487 in MondoRescue

Timestamp:

Nov 18, 2009, 9:40:56 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3620@localhost: bruno | 2009-11-18 10:31:36 +0100

• Only link /dev/tty to serial port when there is indeed a serial port. If not breaks mondorestore on normal console

Location:

branches

Files:

• 2.2.10/mindi/rootfs/sbin/init (modified) (13 diffs)
• 2.2.9/mindi/rootfs/sbin/init (modified) (1 diff)

branches/2.2.10/mindi/rootfs/sbin/init

@@ -74 +74 @@
             echo -en "\rExtracting /$fname...     "
             tar -zxf /$fname || LogIt "Error occurred while extracting /$fname"
+            rm -f /$fname
         fi
     done
@@ -94 +95 @@
     # By default first serial line is configured as tty
     # Required to have a correct serial console support (MP on ia64 or VSP with iLO2 e.g.)
-    serial=/dev/ttyS0
     for i in `cat /proc/cmdline` ; do
         echo $i | grep -qi serial= && serial=`echo $i | cut -d= -f2`
     done
-    ln -s -f $serial /dev/tty
+    # Doing that is only valid when using a real serial line
+    if [ -f $serial ]; then
+        ln -s -f $serial /dev/tty
+    fi
 }
 
@@ -104 +107 @@
 LoadKeymap() {
     local fname
-    fname=`cat /tmp/KEYMAP-LIVES-HERE 2> /dev/null`
+    fname=`cat $MINDI_CACHE/KEYMAP-LIVES-HERE 2> /dev/null`
     [ "$fname" = "" ] && return
     if which loadkeys > /dev/null 2> /dev/null ; then
         loadkeys $fname
-# loadkmap != loadkeys
-#    elif which loadkmap > /dev/null 2> /dev/null ; then
-#        loadkmap < $fname
     else
         LogIt "Using default keyboard map." 1
@@ -217 +217 @@
 
 
-PauseForRaids() {
-    if [ "`dmesg | grep -i "RAID Controller"`" != "" ] || [ "`dmesg | grep -i "Vendor: 3ware"`" != "" ] ; then
-        LogIt "RAID controller(s) detected. Pausing 10 seconds to let them warm up." 1
-        echo -en "Pausing..."
-        for i in 1 2 3 4 5 6 7 8 9 10 ; do
-            sleep 1
-            echo -en "$(($i*10))%..."
-        done
-        echo "Done."
-    fi
-}
-
-
 # --- cater for arbitrary locations of devfsd.conf by using the
 #     config file path compiled into devfsd
@@ -333 +320 @@
         fi
     done
+    rm -rf /dev.static
     echo $PKLVL > /proc/sys/kernel/printk
 }
@@ -410 +398 @@
             sleep 1
         done
+        rm -f /tmp/start-lvm
         echo "Done."
     fi
@@ -590 +579 @@
         rm -rf /tmp.old
         mkdir -p /tmp/tmpfs
-    echo "Done."
-    LogIt "Successfully mounted dynamic /tmp ramdisk"
-#   mkdir -p /tmp/tmpfs/var
-#        mv -f /var/log /tmp/tmpfs/var/log
-#        ln -sf /tmp/tmpfs/var/log /var/log
+        echo "Done."
+        LogIt "Successfully mounted dynamic /tmp ramdisk"
     fi
 }
@@ -663 +649 @@
 LOGFILE=/var/log/mondorestore.log
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
-GROOVY=/tmp/groovy-stuff
+GROOVY=$MINDI_CACHE/groovy-stuff
 USER=root
 ARCH=`uname -m`
@@ -673 +659 @@
 mount -o remount rw /
 [ ! "$GROOVY" ] && Die "I'm not groovy!"
-for i in $GROOVY /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
+for i in /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
     mkdir -p $i
 done
@@ -740 +726 @@
 elif [ "`grep -i pxe $CMDLINE`" ]; then
     # Simulate a local CD
-    echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
+    echo "/mnt/cdrom" > $MINDI_CACHE/CDROM-LIVES-HERE
     CD_MOUNTED_OK=yes
     ExtractDataDisksAndLoadModules
@@ -749 +735 @@
 
     # Simulate a local CD
-    echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
+    echo "/mnt/cdrom" > $MINDI_CACHE/CDROM-LIVES-HERE
     CD_MOUNTED_OK=yes
     ExtractDataDisksAndLoadModules
@@ -769 +755 @@
 WelcomeMessage
 RstHW
-echo "Starting potential Raid/LVMs ..."
-PauseForRaids
 StartRaids
 StartMpath
@@ -835 +819 @@
 ide-opt
 
-#ctrlaltdel soft
-for path in /usr.bin /usr/bin ; do
-    fname=$path/nano
-    [ -e "$fname" ] && ln -sf $fname /usr/bin/pico
-done
-res=`which nano 2> /dev/null`
-[ "$res" ] && ln -sf /usr/bin/
-for i in null stdout stdin stderr ; do
-    cp -af /dev/$i /tmp
-done
 # Not sure it's still needed, but shouldn't hurt
 if [ -e "/tmp/USE-UDEV" ] ; then

branches/2.2.9/mindi/rootfs/sbin/init

@@ -83 +83 @@
     # By default first serial line is configured as tty
     # Required to have a correct serial console support (MP on ia64 or VSP with iLO2 e.g.)
-    serial=/dev/ttyS0
     for i in `cat /proc/cmdline` ; do
         echo $i | grep -qi serial= && serial=`echo $i | cut -d= -f2`
     done
-    ln -s -f $serial /dev/tty
+    # Doing that is only valid when using a real serial line
+    if [ -f $serial ]; then
+        ln -s -f $serial /dev/tty
+    fi
 }