Changeset 1977 in MondoRescue for branches/stable/mindi/rootfs

Timestamp:

Jun 2, 2008, 10:49:01 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1938:1976 $SVN_M/branches/2.2.6

Location:

branches/stable/mindi/rootfs

Files:

• dev/dev-entries.tgz (modified) ( previous)
• sbin/init (modified) (7 diffs)
• sbin/post-init (modified) (4 diffs)

branches/stable/mindi/rootfs/sbin/init

@@ -105 +105 @@
     [ "$1" != "" ] && tapedev=$1
     [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d' ' -f2`
-#    tar -zxf $tapedev
+    mt -f $tapedev rewind
+    mt -f $tapedev fsf 2
     dd if=$tapedev bs=32k count=1024 | tar -zx
     res=$?
     if [ "$res" -eq "0" ] ; then
-    grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
-    echo "media-dev=$tapedev" >> /tmp/mr.cfg
-        cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
+        # Store the dev name in case we changed it interactively
+        sed -i "s/^media-dev .*$/media-dev  $tapedev/" /tmp/mondo-restore.cfg
+
+        #grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
+        #echo "media-dev $tapedev" >> /tmp/mr.cfg
+        #cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
     fi
     cd $old_pwd
@@ -120 +124 @@
     local res tapedev
     tapedev="" ; # will be set by UntarTapeStuff()
+
+    # Here we can add the USB storage module, it's working even with OBDR !
+    modprobe -q usb-storage
+    # Tape takes some time to appear
+    sleep 10
     cd $GROOVY
-    UntarTapeStuff $tapedev || UntarTapeStuff /dev/st0 || UntarTapeStuff /dev/osst0 || UntarTapeStuff /dev/ht0
+    UntarTapeStuff $tapedev
     res=$?
     while [ "$res" -ne "0" ] ; do
@@ -139 +148 @@
         fi
     done
+    # For post-init
+    export TAPEDEV=$tapedev
 
     if [ "$res" -ne "0" ] ; then
@@ -146 +157 @@
         res=$?
     else
-    #   clear
         LogIt "Using tape as extended datadisk. Good." 3
         echo "Using tape as extd ddisk." > /tmp/TAPEDEV-HAS-DATA-DISKS
@@ -584 +594 @@
     export DENY_MODS=" "
 fi
-
+if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg`" ]; then
+    # Do not try to load usb storage when dealing with OBDR it makes the modprobe hang :-(
+    export DENY_MODS="usb-storage $DENY_MODS"
+fi
 if [ "`grep -i forcemods /proc/cmdline`" ]; then
     export FORCE_MODS="`cat /proc/cmdline | sed 's~.*forcemods=\"\(.*\)\".*~\1~'` mondonone"
@@ -623 +636 @@
 fi
 
-if [ "`grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ]; then
+if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i ' udev' /tmp/mondo-restore.cfg`" ]; then
     HandleTape
     ExtractDataDisksAndLoadModules
@@ -635 +648 @@
     ExtractDataDisksAndLoadModules
 elif [ "`grep -i usb= /proc/cmdline`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg | grep media-type`" ]; then
-    # We need to get here exported variables from start-nfs
     . /sbin/start-usb
 

branches/stable/mindi/rootfs/sbin/post-init

@@ -104 +104 @@
 done
 
+mondoopt=""
+if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg`" ]; then
+    mondoopt="$mondoopt -o -d $TAPEDEV"
+fi
+
+if [ "`grep -i 'debug' /proc/cmdline`" ]; then
+    mondoopt="$mondoopt -K 99"
+fi
+
 if [ "$compare" ] ; then
     LogIt "------------------COMPARE MODE-----------------" 1
-    mondorestore --compare
+    mondorestore $mondoopt -Z compare
 elif [ "$nuke" ] ; then
     LogIt "-------------------NUKE MODE-------------------" 1
-    mondorestore --nuke
+    mondorestore $mondoopt -Z nuke
 elif [ "$expert" ] ; then
     if [ "`grep tapedev /tmp/mondo-restore.cfg`" ] ; then
@@ -119 +128 @@
         LogIt "Tape Mode -- calling mondorestore..."
             if [ "$nuke" ] ; then
-                mondorestore --nuke
+                mondorestore $mondoopt -Z nuke
             else
-                mondorestore; # MR will detect & access the tape
+                mondorestore $mondoopt; # MR will detect & access the tape
             fi
     fi
@@ -132 +141 @@
             LogIt "Cdstream Mode -- calling mondorestore..."
             if [ "$nuke" ] ; then
-                mondorestore --nuke
+                mondorestore -Z nuke $mondoopt
             else
-                mondorestore; # MR will detect & access the cdstream
+                mondorestore $mondoopt; # MR will detect & access the cdstream
             fi
         fi
@@ -147 +156 @@
 else
     LogIt "------------------INTERACTIVE------------------" 1
-    mondorestore --interactive
+    mondorestore -Z interactive $mondoopt
 fi
 
-[ -e "/tmp/DO-MBR-PLEASE" ] && LogIt "PLEASE RUN 'mondorestore --mbr' NOW TO INITIALIZE YOUR BOOT SECTOR." 1
+[ -e "/tmp/DO-MBR-PLEASE" ] && LogIt "PLEASE RUN 'mondorestore -Z mbr' NOW TO INITIALIZE YOUR BOOT SECTOR." 1
 
 exit 0