Changeset 1745 in MondoRescue for branches/2.2.5

Timestamp:

Oct 30, 2007, 12:18:10 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix a command build format error
• USB should never be ejected

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-devices.c (modified) (2 diffs)
• common/libmondo-fork.c (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (1 diff)

branches/2.2.5/mondo/src/common/libmondo-devices.c

@@ -1645 +1645 @@
 
 #else
-    sprintf(command, "mount %s -t vfat 2>> %s",
+    sprintf(command, "mount %s -t vfat %s 2>> %s",
             device, mountpoint, MONDO_LOGFILE);
 #endif
@@ -1909 +1909 @@
     case dvd:
     case usb:
+        /* Never try to eject a USB device */
+        if (bkpinfo->backup_media_type == usb) {
+            bkpinfo->please_dont_eject = FALSE;
+        }
         if (archiving_to_media) {
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {

branches/2.2.5/mondo/src/common/libmondo-fork.c

@@ -288 +288 @@
     paranoid_free(old_stderr);
     paranoid_free(cd_number_str);
-/*
-  if (bkpinfo->backup_media_type == dvd && !bkpinfo->please_dont_eject_when_restoring)
-    {
-      log_msg(3, "Ejecting DVD device");
-      eject_device(bkpinfo->media_device);
-    }
-*/
     return (retval);
 }

branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c

@@ -677 +677 @@
     if (flag_set['U']) {
         bkpinfo->backup_media_type = usb;
+        /* Never try to eject a USB device */
+        bkpinfo->please_dont_eject = FALSE;
     }
     if (flag_set['z']) {