Changeset 1958 in MondoRescue for branches/2.2.6/mindi/rootfs/sbin/init

Timestamp:

May 28, 2008, 1:59:55 PM (16 years ago)

Author:

Bruno Cornec

Message:

Adds prliminary supoprt for OBDR at restore time (was partly coded but not really used up to now in fact)

File:

• branches/2.2.6/mindi/rootfs/sbin/init (modified) (5 diffs)

branches/2.2.6/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 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
@@ -121 +124 @@
     tapedev="" ; # will be set by UntarTapeStuff()
     cd $GROOVY
-    UntarTapeStuff $tapedev || UntarTapeStuff /dev/st0 || UntarTapeStuff /dev/osst0 || UntarTapeStuff /dev/ht0
+    UntarTapeStuff $tapedev
     res=$?
     while [ "$res" -ne "0" ] ; do
@@ -146 +149 @@
         res=$?
     else
-#       clear
         LogIt "Using tape as extended datadisk. Good." 3
         echo "Using tape as extd ddisk." > /tmp/TAPEDEV-HAS-DATA-DISKS
@@ -584 +586 @@
     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="$DENY_MODS usb-storage"
+fi
 if [ "`grep -i forcemods /proc/cmdline`" ]; then
     export FORCE_MODS="`cat /proc/cmdline | sed 's~.*forcemods=\"\(.*\)\".*~\1~'` mondonone"
@@ -623 +628 @@
 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