Ticket #589: rcs.patch

mindi-2.1.1/rootfs/etc/init.d/rcS

@@ -149 +149 @@
     tapedev="" ; # will be set by UntarTapeStuff()
 
     # Here we can add the USB storage module, it's working even with OBDR !
-    modprobe -q usb-storage
+    modprobe -q usb-storage 2>/dev/null
     # Tape takes some time to appear
     sleep 10
     cd $GROOVY
@@ -197 +197 @@
         return
     fi
     echo "Activating a potential USB Storage device"
-    modprobe -q usb-storage
+    modprobe -q usb-storage 2>/dev/null
     for i in 1 2 3 4 5 6 7 8 9 10 ; do
         sleep 1
         echo -en "."
@@ -389 +389 @@
 if [ $? -eq 0 ]; then
     return
 fi
-modprobe -q uhcd_hci
-modprobe -q usbhid
+modprobe -q uhcd_hci 2>/dev/null
+modprobe -q usbhid 2>/dev/null
 }
 
 
@@ -402 +402 @@
     if [ -e "/tmp/i-want-my-lvm" ] ; then
         LogIt "Scanning LVM's..." 1
         if which lvm ; then
-            modprobe -q dm-mod
-            modprobe -q dm_mod
+            modprobe -q dm-mod 2>/dev/null
+            modprobe -q dm_mod 2>/dev/null
             lvm vgscan --mknodes
         else
             vgscan
@@ -686 +686 @@
         echo "$FORCE_MODS" | grep -q "$j "
         if [ $? -eq 0 ]; then
             echo "Forcing first $j..."
-            modprobe -q $j
+            modprobe -q $j 2>/dev/null
         fi
     done
     for m in $lismod; do
@@ -702 +702 @@
             continue
         fi
         echo "Probing $j..."
-        modprobe -q $j
+        modprobe -q $j 2>/dev/null
     done
 }
 
@@ -711 +711 @@
 if [ -x /sbin/udevadm ]; then
     v=`/sbin/udevadm --version`
     echo "Triggering udev again..."
-    if [ "$v" -ge "146" ]; then
+    if [ "$v" -ge "146" -a "$v" -lt "174" ]; then
         /sbin/udevadm trigger --type=failed
-    else
+    elif [ "$v" -lt "146" ]; then
         /sbin/udevadm trigger --retry-failed
+    else
+        echo "Triggering not needed!"
     fi
 fi
 }
@@ -741 +743 @@
 MINDI_VER=2.1.1
 MINDI_REV=2957
 trap CaughtSoftReset SIGTERM
-trap GetShell SIGINTR
+trap GetShell SIGINT
 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