Changeset 2127 in MondoRescue

Timestamp:

Jan 14, 2009, 10:05:17 PM (16 years ago)

Author:

Bruno Cornec

Message:

When forcing a USB device through Boot CLI, mondorestore is now taking it in account as the restore deveice, instead of taking what is in the conf file.

Location:

branches/2.2.8

Files:

• mindi/rootfs/sbin/start-usb (modified) (3 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/2.2.8/mindi/rootfs/sbin/start-usb

@@ -7 +7 @@
 
 # Get info from config file
-usbdev=`grep usb-dev /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+MRUSBDEV=`grep usb-dev /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
 
 # info from cmdline are predominent
 for i in `cat /proc/cmdline` ; do
-    echo $i | grep -qi usb= && usbdev=`echo $i | cut -d= -f2`
+    echo $i | grep -qi usb= && MRUSBDEV=`echo $i | cut -d= -f2`
 done
 
-if [ $usbdev = "" ]; then
+if [ $MRUSBDEV = "" ]; then
     # No usb configuration neither stored during archive
     # nor on cmdline so no usb wanted => exiting
@@ -20 +20 @@
 fi
 
-echo -en "Mounting USB device (${usbdev}1) on /mnt/cdrom..."
+export MRUSBDEV
+
+echo -en "Mounting USB device (${MRUSBDEV}1) on /mnt/cdrom..."
 /sbin/modprobe usb-storage
 for i in 1 2 3 4 5 6 7 8 9 10 ; do
@@ -26 +28 @@
         echo -en "."
 done
-mount -t vfat ${usbdev}1 /mnt/cdrom && LogIt "USB device (${usbdev}1) mounted on /mnt/cdrom" 
+mount -t vfat ${MRUSBDEV}1 /mnt/cdrom && LogIt "USB device (${MRUSBDEV}1) mounted on /mnt/cdrom" 
 echo "."

branches/2.2.8/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -854 +854 @@
         bkpinfo->media_size[1] = 650;   /* good guess */
     } else if (bkpinfo->backup_media_type == usb) {
-        if (read_cfg_var(cfg_file, "usb-dev", value)) {
-            fatal_error("Cannot get USB device name from cfg file");
+        envtmp1 = getenv("MRUSBDEV");
+        if (envtmp1 == NULL) {
+            if (read_cfg_var(cfg_file, "usb-dev", value)) {
+                fatal_error("Cannot get USB device name from cfg file");
+            }
+        } else {
+            strcpy(value,envtmp1);
         }
         sprintf(bkpinfo->media_device, "%s1", value);