Changeset 3875 in MondoRescue

Timestamp:

Mar 8, 2024, 3:19:14 AM (7 weeks ago)

Author:

Bruno Cornec

Message:

find_dvd|cdrom_device merged into a rewritten find_optical_device - adds find_usb_device and find_device - mount_CDROM_here moved to mount_media (ongoing)

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-archive.c (modified) (4 diffs)
• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-devices-EXT.h (modified) (2 diffs)
• common/libmondo-devices.c (modified) (26 diffs)
• common/mondostructures.h (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (2 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)

branches/3.3/mondo/src/common/libmondo-archive.c

@@ -2466 +2466 @@
 
     mr_asprintf(bkp, "%s", cd_dev);
-    if ((cd_dev = find_dvd_device()) != NULL) {
+    if ((cd_dev = find_optical_device()) != NULL) {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
             mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cd_dev);
@@ -2536 +2536 @@
     ok_go_ahead_burn_it = TRUE;
     mr_free(cdrom_dev);
-    if ((cdrom_dev = find_cdrom_device()) != NULL) {
+    if ((cdrom_dev = find_optical_device()) != NULL) {
         /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
         log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
@@ -3096 +3096 @@
         if (g_current_media_number == 1 && !res
             && (bkpinfo->backup_media_type == cdr)) {
-            if ((tmp = find_cdrom_device()) == NULL) {  // make sure find_cdrom_device() finds, records CD-R's loc
+            if ((tmp = find_optical_device())   == NULL) {  // make sure find_optical_device() finds, records CD-R's loc
                 log_msg(3, "*Sigh* Mike, I hate your computer.");
                 // if it can't be found then force pausing
@@ -3208 +3208 @@
         if (bkpinfo->backup_media_type != iso) {
             mr_free(bkpinfo->media_device);
-            bkpinfo->media_device = find_cdrom_device();    // replace 0,0,0 with /dev/cdrom
+            bkpinfo->media_device = find_optical_device();  // replace 0,0,0 with /dev/cdrom
         }
         if (chdir("/")) {

branches/3.3/mondo/src/common/libmondo-cli.c

@@ -349 +349 @@
         }
         if (!flag_set['d']) {
-            if ((bkpinfo->media_device = find_dvd_device()) != NULL) {
+            if ((bkpinfo->media_device = find_optical_device()) != NULL) {
                 flag_set['d'] = TRUE;
                 log_to_screen("I guess DVD drive is at %s", bkpinfo->media_device);

branches/3.3/mondo/src/common/libmondo-devices-EXT.h

@@ -2 +2 @@
  * $Id$
  */
+/* Reviewed */
+extern char *find_optical_device(void);
 
+/* TBC */
 extern bool am_I_in_disaster_recovery_mode(void);
 extern bool does_device_exist(char *device);
 extern int does_partition_exist(const char *drive, int partno);
 extern bool does_string_exist_in_boot_block(char *dev, char *str);
-extern int find_and_mount_actual_cd(
-                                    char *mountpoint);
-extern int find_cdrom_device(char *output, bool try_to_mount);
-extern char *find_dvd_device(void);
+extern int find_and_mount_actual_cd(char *mountpoint);
 extern long get_phys_size_of_drive(char *drive);
 extern bool is_this_a_valid_disk_format(char *format);
@@ -16 +16 @@
 extern int find_device_in_mountlist(struct mountlist_itself *mountlist,
                                     char *device);
-extern int mount_CDROM_here(char *device, const char *mountpoint);
 extern long long size_of_specific_device_in_mountlist(struct
                                                       mountlist_itself

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

@@ -447 +447 @@
 
 
-
-/**
- * Try to mount CD-ROM at @p mountpoint. If the CD-ROM is not found or has
- * not been specified, call find_cdrom_device() to find it.
+/**
+ * Try to mount CD/DVD at @p mountpoint. If the CD/DVD is not found or has
+ * not been specified, call find_optical_device() to find it.
  * @param mountpoint Where to mount the CD-ROM.
- * @return 0 for success, nonzero for failure.
- * @see mount_CDROM_here
- */
-int find_and_mount_actual_cd(char *mountpoint) {
+ * @return TRUE for success, FALSE for failure.
+ * @see mount_media
+ */
+bool find_and_mount_actual_cd(char *mountpoint) {
 
     /*@ buffers ***************************************************** */
 
     /*@ int's  ****************************************************** */
-    int res;
+    bool res;
 
     /*@ end vars **************************************************** */
@@ -467 +466 @@
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
 
-    if (g_backup_media_type == dvd) {
-        if (bkpinfo->media_device == NULL) {
-            bkpinfo->media_device = find_dvd_device();
-        }
-    } else {
-        if (bkpinfo->media_device == NULL) {
-            bkpinfo->media_device = find_cdrom_device();
-        }
+    if (bkpinfo->media_device == NULL) {
+        bkpinfo->media_device = find_optical_device();
     }
 
@@ -481 +474 @@
     }
 
-    if ((bkpinfo->media_device == NULL) || (res = mount_CDROM_here(bkpinfo->media_device, mountpoint))) {
+    if ((bkpinfo->media_device == NULL) || (res = mount_media(mountpoint))) {
         mr_free(bkpinfo->media_device);
         if ((bkpinfo->media_device = mr_popup_and_get_string("CD-ROM device", "Please enter your CD-ROM's /dev device", "/dev/cdrom")) == NULL) {
-            res = 1;
+            res = TRUE;
         } else {
-            res = mount_CDROM_here(bkpinfo->media_device, mountpoint);
+            res = mount_media(mountpoint);
         }
     }
@@ -496 +489 @@
     return (res);
 }
-
-
-/**
- * Attempt to locate a CD-ROM device's /dev entry.
- * Several different methods may be used to find the device, including
- * calling @c cdrecord, searching @c dmesg, and trial-and-error.
- * @param output Where to put the located /dev entry.
- * @param try_to_mount Whether to mount the CD as part of the test; if mount
- * fails then return failure.
- * @return 0 for success, nonzero for failure.
- */
-int find_cdrom_device(char *output, bool try_to_mount)
-{
-    /*@ pointers **************************************************** */
-    FILE *fin;
-    char *p;
-    char *q;
-    char *r;
-    int retval = 0;
-
-    /*@ bool's ****************************************************** */
-    bool found_it = FALSE;
-
-    /*@ buffers ***************************************************** */
-    char *tmp = NULL;
+/* 
+ * This function tries to find a USB media device
+ * and return it's device file to the caller that needs to free it
+ */
+char *find_usb_device(void)
+{
+    char *dev = NULL;
     char *tmp1 = NULL;
-    char *cdr_exe = NULL;
-    char *phrase_one;
-    char *phrase_two = NULL;
     char *command = NULL;
-#ifndef __FreeBSD__
-    char *dvd_last_resort = NULL;
-#endif
-    char *mountpoint = NULL;
-    static char the_last_place_i_found_it[MAX_STR_LEN] = "";
-
-    assert_string_is_neither_NULL_nor_zerolength(output);
-    output[0] = '\0';
-
-    if (g_cdrom_drive_is_here[0] && !isdigit(g_cdrom_drive_is_here[0])) {
-        strcpy(output, g_cdrom_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", output);
-        return(0);
-    }
-    if (the_last_place_i_found_it[0] != '\0' && !try_to_mount) {
-        strcpy(output, the_last_place_i_found_it);
-        log_msg(3, "find_cdrom_device() --- returning last found location - '%s'", output);
-        return(0);
-    }
-
-    if ((cdr_exe = find_home_of_exe("cdrecord")) == NULL) {
-        if ((cdr_exe = find_home_of_exe("wodim")) == NULL) {
-            cdr_exe = find_home_of_exe("dvdrecord");
-        }
-    }
-
-    if (cdr_exe == NULL) {
-        strcpy(output, "/dev/cdrom");
-        log_msg(4, "Can't find cdrecord; assuming %s", output);
-        if (!does_device_exist(output)) {
-            log_msg(4, "That didn't work. Sorry.");
-            return(1);
-        } else {
-            return(0);
-        }
-    }
-
-    mr_asprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
-    fin = popen(command, "r");
-    if (!fin) {
-        log_msg(4, "command=%s", command);
-        log_OS_error("Cannot popen command");
-        mr_free(cdr_exe);
+
+    log_to_screen("I am looking for your USB key. Please wait.");
+
+    if (bkpinfo->media_device != NULL) {
+        log_msg(3, "Been there, done that. Returning %s", bkpinfo->media_device);
+        return (bkpinfo->media_device);
+    }
+
+    tmp1 = find_home_of_exe("lsscsi");
+    if (tmp1 != NULL) {
+        mr_asprintf(command, "%s | grep ' disk' | grep USB | awk '{print $NF}' | head -1", tmp1);
+        dev = call_program_and_get_last_line_of_output(command);
         mr_free(command);
-        return(1);
-    }
-    mr_free(command);
-
-    /*@ intialize *************************************************** */
-    malloc_string(tmp);
-    malloc_string(phrase_one);
-
-    phrase_one[0] = '\0';
-    tmp[0] = '\0';
-
-    /*@ end vars **************************************************** */
-
-
-    for (tmp1 = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (tmp1 != NULL);
-         tmp1 = fgets(tmp, MAX_STR_LEN, fin)) {
-        p = strchr(tmp, '\'');
-        if (p) {
-            q = strchr(++p, '\'');
-            if (q) {
-                for (r = q; *(r - 1) == ' '; r--);
-                *r = '\0';
-                strcpy(phrase_one, p);
-                p = strchr(++q, '\'');
-                if (p) {
-                    q = strchr(++p, '\'');
-                    if (q) {
-                        while (*(q - 1) == ' ') {
-                            q--;
-                        }
-                        *q = '\0';
-                        mr_asprintf(phrase_two, "%s", p);
-                    }
-                }
-            }
-        }
-    }
-    paranoid_pclose(fin);
-
-#ifndef __FreeBSD__
-    if (!phrase_two || strlen(phrase_two) == 0) {
-        log_msg(4, "Not running phase two. String is empty.");
+    }
+    mr_free(tmp1);
+
+    if ((dev == NULL) || !does_file_exist(dev)) {
+        tmp1 = find_home_of_exe("lsblk");
+        if (tmp1 != NULL) {
+            mr_asprintf(command, "%s --noheadings --raw --output rm,tran,type,path --sort path | awk '/^1 usb disk/ {d=$4} END {print d}'", tmp1);
+            dev = call_program_and_get_last_line_of_output(command);
+            mr_free(command);
+        }
+        mr_free(tmp1);
+        log_it("Unable to find a tape device on this system");
+    }
+    if (dev != NULL) {
+        log_it("find_usb_device found %s manually", dev);
+    }
+
+    if ((dev != NULL) && does_file_exist(dev)) {
+        log_it("find_usb_device returns %s", dev);
     } else {
-        mr_asprintf(command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
-        fin = popen(command, "r");
-        mr_free(command);
-
-        if (!fin) {
-            log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
-        } else {
-            for (tmp1 = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (tmp1 != NULL);
-                 tmp1 = fgets(tmp, MAX_STR_LEN, fin)) {
-                log_msg(5, "--> '%s'", tmp);
-                if (tmp[0] != ' ' && tmp[1] != ' ') {
-                    p = strchr(tmp, ':');
-                    if (p) {
-                        *p = '\0';
-                        if (strstr(tmp, "DVD")) {
-                            mr_free(dvd_last_resort);
-                            mr_asprintf(dvd_last_resort, "/dev/%s", tmp);
-                            log_msg(4, "Ignoring '%s' because it's a DVD drive", tmp);
-                        } else {
-                            sprintf(output, "/dev/%s", tmp);
-                            found_it = TRUE;
-                        }
-                    }
-                }
-            }
-            paranoid_pclose(fin);
-        }
-    }
-
-#endif
-#ifdef __FreeBSD__
-    if (!found_it) {
-        log_msg(4, "OK, approach 2");
-        if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/cdrom"))) {
-            if (!
-                (found_it =
-                 set_dev_to_this_if_rx_OK(output, "/dev/cdrom1"))) {
-                if (!
-                    (found_it =
-                     set_dev_to_this_if_rx_OK(output, "/dev/dvd"))) {
-                    if (!
-                        (found_it =
-                         set_dev_to_this_if_rx_OK(output, "/dev/acd0"))) {
-                        if (!
-                            (found_it =
-                             set_dev_to_this_if_rx_OK(output,
-                                                      "/dev/cd01"))) {
-                            if (!
-                                (found_it =
-                                 set_dev_to_this_if_rx_OK(output,
-                                                          "/dev/acd1"))) {
-                                if (!
-                                    (found_it =
-                                     set_dev_to_this_if_rx_OK(output,
-                                                              "/dev/cd1")))
-                                {
-                                    retval = 1;
-                                    goto end_of_find_cdrom_device;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-#else
-    if (!found_it && strlen(dvd_last_resort) > 0) {
-        log_msg(4, "Well, I'll use the DVD - %s - as a last resort", dvd_last_resort);
-        strcpy(output, dvd_last_resort);
-        found_it = TRUE;
-    }
-    if (found_it) {
-        sprintf(tmp, "grep \"%s=ide-scsi\" "CMDLINE" &> /dev/null", strrchr(output, '/') + 1);
-        if (system(tmp) == 0) {
-            log_msg(4, "%s is not right. It's being SCSI-emulated. Continuing.", output);
-            found_it = FALSE;
-            output[0] = '\0';
-        }
-    }
-
-    if (found_it) {
-        log_msg(4, "(find_cdrom_device) --> '%s'", output);
-        if (!does_device_exist(output)) {
-            found_it = FALSE;
-            log_msg(4, "OK, I was wrong, I haven't found it... yet.");
-        }
-    }
-
-    if (!found_it) {
-        log_msg(4, "OK, approach 2");
-        if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/scd0"))) {
-            if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/sr0"))) {
-                if (!
-                    (found_it =
-                     set_dev_to_this_if_rx_OK(output, "/dev/cdrom"))) {
-                    if (!
-                        (found_it =
-                         set_dev_to_this_if_rx_OK(output,
-                                                  "/dev/cdrom0"))) {
-                        if (!
-                            (found_it =
-                             set_dev_to_this_if_rx_OK(output,
-                                                      "/dev/cdrom1"))) {
-                            if (!
-                                (found_it =
-                                 set_dev_to_this_if_rx_OK(output,
-                                                          "/dev/sr1"))) {
-                                if (!
-                                    (found_it =
-                                     set_dev_to_this_if_rx_OK(output,
-                                                              "/dev/dvd")))
-                                {
-                                    if (!
-                                        (found_it =
-                                         set_dev_to_this_if_rx_OK(output,
-                                                                  g_cd_drive_is_here)))
-                                    {
-                                        retval = 1;
-                                        goto end_of_find_cdrom_device;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-#endif
-
-    mr_asprintf(mountpoint, "%s/cd.mnt", bkpinfo->tmpdir);
-    make_hole_for_dir(mountpoint);
-
-    if (found_it && try_to_mount) {
-        if (mount_CDROM_here(output, mountpoint)) {
-            log_msg(4, "[Cardigans] I've changed my mind");
-            found_it = FALSE;
-        } else {
-            sprintf(tmp, "%s/archives", mountpoint);
-            if (!does_file_exist(tmp)) {
-                log_msg(4, "[Cardigans] I'll take it back");
-                found_it = FALSE;
-            } else {
-                mr_asprintf(command, "umount %s", output);
-                paranoid_system(command);
-                mr_free(command);
-
-                log_msg(4, "I'm confident the Mondo CD is in %s", output);
-            }
-        }
-    }
-    unlink(mountpoint);
-    mr_free(mountpoint);
-
-    if (found_it) {
-        if (!does_file_exist(output)) {
-            log_msg(3, "I still haven't found it.");
-            return (1);
-        }
-        log_msg(3, "(find_cdrom_device) --> '%s'", output);
-        strcpy(the_last_place_i_found_it, output);
-        strcpy(g_cdrom_drive_is_here, output);
-        retval = 0;
-        goto end_of_find_cdrom_device;
-    }
-
-    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cd_drive_is_here);
-
-    log_msg(1, "command=%s", command);
-    tmp1 = call_program_and_get_last_line_of_output(command);
-    mr_free(command);
-
-    if (strlen(tmp1) > 0) {
-        strcpy(output, tmp1);
-        log_msg(4, "Finally found it at %s", output);
-        retval = 0;
-    } else {
-        log_msg(4, "Still couldn't find it.");
-        retval = 1;
-    }
-    mr_free(tmp1);
-
-  end_of_find_cdrom_device:
-    mr_free(cdr_exe);
-    mr_free(phrase_two);
-    mr_free(dvd_last_resort);
-
-    paranoid_free(tmp);
-    paranoid_free(phrase_one);
-    return (retval);
-}
+        mr_free(dev);
+        log_it("find_usb_device found no USB key on your system returning NULL");
+    }
+    return(dev);
+}
+
 
 /* 
@@ -810 +542 @@
  * and return it's device file to the caller that needs to free it
  */
-char *find_dvd_device(void)
+char *find_optical_device(void)
 {
     char *dev = NULL;
@@ -828 +560 @@
 
     if ((dev != NULL) && does_file_exist(dev)) {
-        log_msg(2, "find_dvd_device found %s automatically", dev);
+        log_msg(2, "find_optical_device found %s automatically", dev);
     } else {
         mr_free(dev);
@@ -845 +577 @@
                 mr_asprintf(dev, "%s", ALT_CDROM);
                 if (!does_file_exist(dev)) {
-                    log_it("Unable to find a tape device on this system");
+                    mr_asprintf(dev, "%s", "/dev/cdrom");
+                    if (!does_file_exist(dev)) {
+                        mr_asprintf(dev, "%s", "/dev/dvd");
+                        if (!does_file_exist(dev)) {
+                            log_it("Unable to find a tape device on this system");
                 }
             }
         }
         if (dev != NULL) {
-            log_it("find_dvd_device found %s manually", dev);
+            log_it("find_optical_device found %s manually", dev);
         }
     } 
 
     if ((dev != NULL) && does_file_exist(dev)) {
-        log_it("find_dvd_device returns %s", dev);
+        log_it("find_optical_device returns %s", dev);
     } else {
         mr_free(dev);
-        log_it("find_dvd_device found no optical burner on your system returning NULL");
+        log_it("find_optical_device found no optical burner on your system returning NULL");
     }
     return(dev);
 }
+
+/* Generic fund to find a media 
+ * Return a dynamically allocted string that caller needs to free 
+ * @media_type is the type of media to look for
+ */
+
+char *find_device(t_bkptype media_type) {
+
+    if (media_type == usb) {
+        return(find_usb_device());
+    } else if (media_type == tape) {
+        return(find_tape_device());
+    } else if ((media_type == dvd) || (media_type == cdr)) {
+        return(find_optical_device());
+    } else {
+        return(NULL);
+    }
+}
+
+
 
 
@@ -1215 +971 @@
 
 /**
- * Mount the CD-ROM at @p mountpoint.
- * @param device The device (or file if g_ISO_restore_mode) to mount.
- * @param mountpoint The place to mount it.
- * @return 0 for success, nonzero for failure.
- */
-int mount_CDROM_here(char *device, const char *mountpoint)
-{
-    /*@ buffer ****************************************************** */
-    char *command = NULL;
-    int retval;
-#ifdef __FreeBSD__
-    char *dev = NULL;
-#else
-    char *options = NULL;
-#endif
-
-    assert_string_is_neither_NULL_nor_zerolength(device);
-    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-
-    make_hole_for_dir(mountpoint);
-
-    if (isdigit(device[0])) {
-        find_cdrom_device(device, FALSE);
-    }
-#ifndef __FreeBSD__
-    mr_asprintf(options, "ro");
-#endif
-
-    if (g_ISO_restore_mode) {
-
-#ifdef __FreeBSD__
-        mr_asprintf(dev, "%s", make_vn(device));
-        if (!dev) {
-            mr_asprintf(command, "Unable to mount ISO (make_vn(%s) failed)", device);
-            fatal_error(command);
-        }
-        strcpy(device, dev);
-        paranoid_free(dev);
-#else
-        mr_strcat(options, ",loop");
-#endif
-
-    }
-    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device, mountpoint);
-    /*@ end vars *************************************************** */
-
-#ifdef __FreeBSD__
-    mr_asprintf(command, "mount_cd9660 -r %s %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
-
-#else
-    mr_asprintf(command, "mount %s -o %s -t iso9660 %s 2>> %s", device, options, mountpoint, MONDO_LOGFILE);
-    paranoid_free(options);
-#endif
-
-    log_msg(4, command);
-    if (strncmp(device, "/dev/", 5) == 0) {
-        retract_CD_tray_and_defeat_autorun();
-    }
-    retval = system(command);
-    log_msg(1, "system(%s) returned %d", command, retval);
-    mr_free(command);
-
-    return (retval);
-}
-
-
-/**
 * Mount the CD-ROM or USB device at /mnt/cdrom.
 * @param bkpinfo The backup information structure. Fields used: 
@@ -1288 +977 @@
 * - @c bkpinfo->isodir
 * - @c bkpinfo->media_device
-* @return 0 for success, nonzero for failure.
+* @return TRUE for success, FALSE for failure.
 */
-int mount_media()
-{
-char *mount_cmd = NULL;
-char *mountdir = NULL;
-int i, res;
+bool mount_media(const char *mountpoint) {
+
+    char *mount_cmd = NULL;
+    char *mountdir = NULL;
+    char *tmp = NULL;
+    int i = 0, res = 0;
 #ifdef __FreeBSD__
     char mdd[32];
     char *mddev = mdd;
+    char *dev;
 #endif
 
     if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
         log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
-        return 0;
-    }
-
-    if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
+        return(TRUE);
+    }
+
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+
+    mr_asprintf(tmp, "mount | grep -F %s", mountpoint);
+    if (!run_program_and_log_output(tmp, FALSE)) {
         log_msg(2, "mount_media() - media already mounted. Fair enough.");
-        return (0);
-    }
+        mr_free(tmp);
+        return (TRUE);
+    }
+    mr_free(tmp);
+
+    make_hole_for_dir(mountpoint);
 
     if (bkpinfo->backup_media_type == netfs) {
@@ -1328 +1026 @@
         mr_free(mount_cmd);
 
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, mountpoint);
 #else
         if (bkpinfo->netfs_remote_dir != NULL) {
             // NETFS
-            mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+            mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, mountpoint);
         } else {
             // ISO
-            mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+            mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, mountpoint);
         }
 #endif
@@ -1350 +1048 @@
         mr_free(mount_cmd);
 
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, mountpoint);
 #else
-        mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", mountdir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", mountdir, bkpinfo->prefix, g_current_media_number, mountpoint);
 #endif
         mr_free(mountdir);
     } else if (bkpinfo->backup_media_type == usb) {
-        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
-    } else if (strstr(bkpinfo->media_device, "/dev/")) {
-#ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
-#else
-        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
-#endif
-    } else {
+        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, mountpoint);
+    } else {    //  optical
         if (bkpinfo->disaster_recovery
             && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
             mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
         } else {
-            find_cdrom_device(bkpinfo->media_device, TRUE);
+            if (bkpinfo->media_device == NULL) {
+                bkpinfo->media_device = find_optical_device();
+            }
         }
 
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+        if (g_ISO_restore_mode) {
+            mr_asprintf(dev, "%s", make_vn(bkpinfo->media_device));
+            if (!dev) {
+                mr_asprintf(command, "Unable to mount ISO (make_vn(%s) failed)", bkpinfo->media_device);
+                fatal_error(command);
+            }
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = dev
+        }
+
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s 2>> %s", bkpinfo->media_device, mountpoint, MONDO_LOGFILE);
 #else
-        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
-#endif
-    }
-
-    log_msg(2, "(mount_media) --- command = %s", mount_cmd);
+        mr_asprintf(mount_cmd, "mount %s -o loop,ro -t iso9660 %s 2>> %s", bkpinfo->media_device, mountpoint, MONDO_LOGFILE);
+#endif
+        log_msg(2, "(mount_media) --- command = %s", mount_cmd);
+        // usefull ??
+        if (strncmp(device, "/dev/", 5) == 0) {
+            retract_CD_tray_and_defeat_autorun();
+        }
+    }
+
     for (i = 0; i < 2; i++) {
         res = run_program_and_log_output(mount_cmd, FALSE);
@@ -1393 +1101 @@
     if (res) {
         log_msg(2, "Failed, despite %d attempts", i);
+        return(FALSE);
     } else {
         log_msg(2, "Mounted media drive OK");
-    }
-    return (res);
+        return(TRUE);
+    }
 }
 /**************************************************************************
-*END_MOUNT_CDROM                                                         *
+*END_MOUNT_MEDIA                                                         *
 **************************************************************************/
 
@@ -2157 +1866 @@
         finish(1);
     }
+    log_msg(3, "media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
+
     /* Why asking to remove the media with tape ?
     if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
@@ -2163 +1874 @@
     */
     if (archiving_to_media) {
+        // TODO: Should be common ?
         setup_tmpdir(NULL);
         /*
@@ -2182 +1894 @@
         setup_scratchdir(tmp);
         mr_free(tmp);
-    }
-    log_msg(3, "media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
-    bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
-    bkpinfo->compression_level = (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
-    bkpinfo->use_lzo = (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
+
+        if ((compression_type = which_compression_type()) == NULL) {
+            log_to_screen("User has chosen not to backup the machine");
+            finish(1);
+        }
+
+        bkpinfo->compression_level = (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
+        if ((bkpinfo->compression_level = which_compression_level()) == -1) {
+            log_to_screen("User has chosen not to backup the machine");
+            finish(1);
+        }
+        bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
+        bkpinfo->use_lzo = (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
+    }
     mvaddstr_and_log_it(2, 0, " ");
 
@@ -2198 +1919 @@
             bkpinfo->please_dont_eject = TRUE;
         }
+        mds = media_descriptor_string(bkpinfo->backup_media_type);
+        if (bkpinfo->backup_media_type != usb) {
+            if (ask_me_yes_or_no("Is your computer a laptop type (manual insert of MondoRescue media)?")) {
+                bkpinfo->manual_cd_tray = TRUE;
+            }
+        }
+
+        if (bkpinfo->media_device == NULL) {
+            bkpinfo->media_device = find_device(bkpinfo->backup_media_type);
+            if (bkpinfo->media_device != NULL) {
+                log_msg(1, "MondoRescue device found automatically for your %s is %s", mds, bkpinfo->media_device);
+            } else {
+                log_msg(1, "No MondoRescue device found yet for your %s", mds);
+            }
+        }
+
         if (archiving_to_media) {
-            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (ask_me_yes_or_no("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")) {
-                    bkpinfo->manual_cd_tray = TRUE;
-                }
-            }
-            if ((compression_type = which_compression_type()) == NULL) {
-                log_to_screen("User has chosen not to backup the machine");
-                finish(1);
-            }
-
-            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
-                log_to_screen("User has chosen not to backup the machine");
-                finish(1);
-            }
-            mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
             if (bkpinfo->backup_media_type == dvd) {
-                bkpinfo->media_device = find_dvd_device();
-                if (bkpinfo->media_device == NULL) {
-                    log_msg(1, "No backup device found for your DVD");
-                }
                 strcpy(tmp1, "1");
                 mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 log_msg(1, "Setting to DVD defaults");
             } else {
-                mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_CDROM);
                 strcpy(tmp1, "4");
                 mr_asprintf(sz_size, "%d", 650);
                 log_msg(1, "Setting to CD defaults");
             }
+
+            mr_asprintf(comment, "What speed is your %s writer?", mds);
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
                 if (!popup_and_get_string("Speed", comment, tmp1, 4)) {
@@ -2241 +1959 @@
             strcpy(tmp1, sz_size);
             mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
-            mr_free(mds);
             if (!popup_and_get_string("Size", comment, tmp1, 5)) {
                 log_to_screen("User has chosen not to backup the machine");
@@ -2256 +1973 @@
         /* No break because we continue even for usb */
     case cdstream:
-        mds = media_descriptor_string(bkpinfo->backup_media_type);
-
-        if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
-            mr_asprintf(bkpinfo->media_device, "%s", "/dev/cdrom");
-            log_msg(2, "CD-ROM device assumed to be at %s", bkpinfo->media_device);
-        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb))  || bkpinfo->backup_media_type == dvd) {
-            if (bkpinfo->media_device == NULL) {
-                mr_asprintf(bkpinfo->media_device, "%s", "/dev/cdrom");
-            }                   // just for the heck of it :)
-            log_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
-            if (bkpinfo->backup_media_type == dvd || find_cdrom_device(bkpinfo->media_device, FALSE)) {
-                log_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
-                mr_asprintf(comment, "Please specify your %s drive's /dev entry", mds);
-                tmp2 = mr_popup_and_get_string("Device?", comment, bkpinfo->media_device);
-                if (!tmp2) {
-                    log_to_screen("User has chosen not to backup the machine");
-                    finish(1);
-                } else {
-                    mr_free(bkpinfo->media_device);
-                    bkpinfo->media_device = tmp2;
-                }
-            }
-            log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
-        } else {
-            if ((find_cdrom_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
+
+        // If media_device not found ask
+        if (bkpinfo->media_device == NULL) {
+            mr_asprintf(comment, "Please specify your Mondorescue %s media /dev entry", mds);
+            tmp2 = mr_popup_and_get_string("/dev entry?", comment, bkpinfo->media_device);
+            if (!tmp2) {
+                log_to_screen("User has chosen not to backup the machine");
+                finish(1);
+            } else {
                 mr_free(bkpinfo->media_device);
-            }
-            if (bkpinfo->media_device != NULL) {
-                if (bkpinfo->backup_media_type == usb) {
-                    mr_asprintf(tmp, "I think your %s media corresponds to %s. Is this correct?", mds, bkpinfo->media_device);
-                } else {
-                    mr_asprintf(tmp, "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)", mds, bkpinfo->media_device);
-                }
-                if (!ask_me_yes_or_no(tmp)) {
-                    mr_free(bkpinfo->media_device);
-                }
-                mr_free(tmp);
-            }
-            if (bkpinfo->media_device != NULL) {
-                if (bkpinfo->backup_media_type == usb) {
-                    tmp2 = mr_popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", bkpinfo->media_device);
-                } else {
-                    if (g_kernel_version < 2.6) {
-                        tmp2 = mr_popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", bkpinfo->media_device);
-                    } else {
-                        tmp2 = mr_popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", bkpinfo->media_device);
-                    }
-                }
-                if (tmp2 == NULL) {
-                    log_to_screen("User has chosen not to backup the machine");
-                    finish(1);
-                } else {
-                    mr_free(bkpinfo->media_device);
-                    bkpinfo->media_device = tmp2;
-                }
+                bkpinfo->media_device = tmp2;
+            }
+        }
+        log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
+        mr_asprintf(tmp, "MondoRescue thinks your %s media corresponds to %s. Is this correct?", mds, bkpinfo->media_device);
+        if (!ask_me_yes_or_no(tmp)) {
+            mr_free(bkpinfo->media_device);
+        }
+        mr_free(tmp);
+
+        if (bkpinfo->media_device == NULL) {
+            mr_asprintf(tmp, "Please then specify your Mondorescue %s media /dev entry", mds);
+            tmp2 = mr_popup_and_get_string("/dev entry?", tmp, bkpinfo->media_device);
+            mr_free(tmp);
+            if (tmp2 == NULL) {
+                log_to_screen("User has chosen not to backup the machine");
+                finish(1);
+            } else {
+                mr_free(bkpinfo->media_device);
+                bkpinfo->media_device = tmp2;
             }
         }
@@ -2338 +2030 @@
         }
         if (bkpinfo->media_device != NULL) {
-            mr_asprintf(tmp, "I think I've found your tape streamer at %s; am I right on the money?", bkpinfo->media_device);
+            mr_asprintf(tmp, "Mondorescue thinks your tape streamer at %s; is that correct?", bkpinfo->media_device);
             if (!ask_me_yes_or_no(tmp)) {
                 mr_free(bkpinfo->media_device);
@@ -2381 +2073 @@
         log_msg(4, "media_size = %ld", bkpinfo->media_size);
 
-        bkpinfo->use_obdr = ask_me_yes_or_no("Do you want to activate OBDR support for your tapes ?");
-        if (bkpinfo->use_obdr) {
-            log_msg(4, "obdr mode = TRUE");
-        } else {
-            log_msg(4, "obdr mode = FALSE");
-        }
         if (archiving_to_media) {
-            if ((compression_type = which_compression_type()) == NULL) {
-                log_to_screen("User has chosen not to backup the machine");
-                finish(1);
-            }
-            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
-                log_to_screen("User has chosen not to backup the machine");
-                finish(1);
+            bkpinfo->use_obdr = ask_me_yes_or_no("Do you want to activate OBDR support for your tapes ?");
+            if (bkpinfo->use_obdr) {
+                log_msg(4, "obdr mode = TRUE");
+            } else {
+                log_msg(4, "obdr mode = FALSE");
             }
         }
         break;
-
-
 
     case netfs:
@@ -2427 +2109 @@
             // surrounding spaces and trailing '/' for this
             bkpinfo->netfs_mount = mr_strip_spaces(p);
-            if (!bkpinfo->restore_data) {
-                if ((compression_type = which_compression_type()) == NULL) {
-                    log_to_screen("User has chosen not to backup the machine");
-                    finish(1);
-                }
-
-                if ((bkpinfo->compression_level = which_compression_level()) == -1) {
-                    log_to_screen("User has chosen not to backup the machine");
-                    finish(1);
-                }
-            }
             if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
                 bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
@@ -2597 +2268 @@
             }
             if (archiving_to_media) {
-                if ((compression_type = which_compression_type()) == NULL) {
-                    log_to_screen("User has chosen not to backup the machine");
-                    finish(1);
-                }
-                if ((bkpinfo->compression_level = which_compression_level()) == -1) {
-                    log_to_screen("User has chosen not to backup the machine");
-                    finish(1);
-                }
                 sprintf(tmp1, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 if (!popup_and_get_string("ISO size.", "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s (700) or DVD's (4480) you plan to backup to.", tmp1, 16)) {
@@ -2791 +2454 @@
             mr_free(bkpinfo->zip_suffix);
         }
+        mr_free(compression_type);
+
 #if __FreeBSD__ == 5
         mr_asprintf(bkpinfo->kernel_path, "%s", "/boot/kernel/kernel");
@@ -2816 +2481 @@
         bkpinfo->restore_data = TRUE;   // probably...
     }
-    mr_free(compression_type);
 
     if (bkpinfo->backup_media_type == iso
@@ -2977 +2641 @@
  * (and remain mounted after this function returns).
  */
-int what_number_cd_is_this()
-{
+int what_number_cd_is_this(void) {
+
     int cd_number = -1;
     char *mountdev = NULL;
@@ -2991 +2655 @@
         cd_number = atoi(last_line_of_file(mountdev));
         mr_free(mountdev);
-
         return (cd_number);
     }
 
-    if (bkpinfo->media_device == NULL) {
-        log_it("ERROR: bkpinfo->media_device shoulnd't be empty here\n");
-        return(0);
-    }
-    mr_asprintf(mountdev, "%s", bkpinfo->media_device);
-    if (!mountdev[0]) {
-        log_it("(what_number_cd_is_this) Warning - media_device unknown. Finding out...");
-        find_cdrom_device(bkpinfo->media_device, FALSE);
-    }
-    if (!is_this_device_mounted(MNT_CDROM)) {
-        if (bkpinfo->backup_media_type == usb) {
-            mount_USB_here(mountdev, MNT_CDROM);
-        } else {
-            mount_CDROM_here(mountdev, MNT_CDROM);
-        }
-    }
-    mr_free(mountdev);
+    if ((bkpinfo->media_device == NULL) || !does_file_exist(bkpinfo->media_device)) {
+        log_it("ERROR: bkpinfo->media_device shoulnd't be unaccessible here\n");
+        /* trying again ! */
+        bkpinfo->media_device = find_optical_device();
+    }
+    if ((bkpinfo->media_device == NULL) || !does_file_exist(bkpinfo->media_device)) {
+        fatal_error("ERROR: bkpinfo->media_device shoulnd't really be unaccessible here\n");
+    }
+    if (!is_this_device_mounted(bkpinfo->media_device, MNT_CDROM)) {
+        mount_media(MNT_CDROM);
+    }
 
     cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
-    return (cd_number);
+    return(cd_number);
 }
 

branches/3.3/mondo/src/common/mondostructures.h

@@ -174 +174 @@
     cdr,                        ///< Back up to recordable CDs (do not erase them).
     dvd,                        ///< Back up to DVD+R[W] or DVD-R[W] disks.
+    // To be removed
     cdstream,                   ///< Back up to recordable CDs but treat them like a tape streamer.
     netfs,                      ///< Back up to an NETFS mount on the local subnet.

branches/3.3/mondo/src/mondoarchive/mondoarchive.c

@@ -281 +281 @@
         g_loglevel = 10;
         setup_newt_stuff();
-        if ((tmp = find_cdrom_device()) == NULL) {
-            printf("Failed to find CDR-RW drive\n");
-        } else {
-            printf("CD-RW is at %s\n", tmp);
+        if ((tmp = find_optical_device()) == NULL) {
+            printf("Failed to find optical drive\n");
+        } else {
+            printf("Optical drive is at %s\n", tmp);
         }
         mr_free(tmp);
@@ -293 +293 @@
         g_loglevel = 10;
         setup_newt_stuff();
-        if (tmp = find_dvd_device()) {
+        if (tmp = find_optical_device()) {
             printf("Failed to find DVD drive\n");
         } else {

branches/3.3/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -655 +655 @@
         mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
     } else {
-        find_cdrom_device(bkpinfo->media_device, FALSE);
+        bkpinfo->media_device = find_optical_device();
     }
     res = verify_tape_backups();