Changeset 2682 in MondoRescue

Timestamp:

Sep 10, 2010, 12:13:40 AM (14 years ago)

Author:

Bruno Cornec

Message:

• mount-media function is now placed in libmondo-devices.c as used by more programs.
• Avoids calling mount_media when it's not mandatory (change the way mondorestore was working up to now but could solve some bugs reported)

Location:

branches/2.2.9/mondo/src

Files:

• common/libmondo-devices.c (modified) (3 diffs)
• mondorestore/mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.h (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (3 diffs)

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

@@ -1343 +1343 @@
 
 
+/**
+* Mount the CD-ROM or USB device at /mnt/cdrom.
+* @param bkpinfo The backup information structure. Fields used: 
+* - @c bkpinfo->backup_media_type
+* - @c bkpinfo->disaster_recovery
+* - @c bkpinfo->isodir
+* - @c bkpinfo->media_device
+* @return 0 for success, nonzero for failure.
+*/
+int mount_media()
+{
+char *mount_cmd;
+int i, res;
+#ifdef __FreeBSD__
+char mdd[32];
+char *mddev = mdd;
+#endif
+
+malloc_string(mount_cmd);
+assert(bkpinfo != NULL);
+
+    if (bkpinfo->backup_media_type == tape
+        || bkpinfo->backup_media_type == udev) {
+        log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
+        paranoid_free(mount_cmd);
+        return 0;
+    }
+
+    if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
+        log_msg(2, "mount_media() - media already mounted. Fair enough.");
+        paranoid_free(mount_cmd);
+        return (0);
+    }
+
+    if (bkpinfo->backup_media_type == netfs) {
+        log_msg(2, "Mounting for Network thingy");
+        log_msg(2, "isodir = %s", bkpinfo->isodir);
+        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
+            && am_I_in_disaster_recovery_mode()) {
+            strcpy(bkpinfo->isodir, "/tmp/isodir");
+            log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
+        }
+#ifdef __FreeBSD__
+        sprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
+            bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        mddev = make_vn(mount_cmd);
+        sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+#else
+        sprintf(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);
+#endif
+
+    } else if (bkpinfo->backup_media_type == iso) {
+#ifdef __FreeBSD__
+        sprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
+            bkpinfo->prefix, g_current_media_number);
+        mddev = make_vn(mount_cmd);
+        sprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+#else
+        sprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
+            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+#endif
+    } else if (bkpinfo->backup_media_type == usb) {
+        sprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
+    } else if (strstr(bkpinfo->media_device, "/dev/")) {
+#ifdef __FreeBSD__
+        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        MNT_CDROM);
+#else
+        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+        bkpinfo->media_device, MNT_CDROM);
+#endif
+    } else {
+        if (bkpinfo->disaster_recovery
+            && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
+            strcpy(bkpinfo->media_device,
+                last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+        } else {
+            find_cdrom_device(bkpinfo->media_device, TRUE);
+        }
+
+#ifdef __FreeBSD__
+    sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        MNT_CDROM);
+#else
+    sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+        bkpinfo->media_device, MNT_CDROM);
+#endif
+    }
+
+    log_msg(2, "(mount_media) --- command = %s", mount_cmd);
+    for (i = 0; i < 2; i++) {
+        res = run_program_and_log_output(mount_cmd, FALSE);
+        if (!res) {
+            break;
+        } else {
+            log_msg(2, "Failed to mount device.");
+            sleep(5);
+            run_program_and_log_output("sync", FALSE);
+        }
+    }
+
+    if (res) {
+        log_msg(2, "Failed, despite %d attempts", i);
+    } else {
+        log_msg(2, "Mounted media drive OK");
+    }
+    paranoid_free(mount_cmd);
+    return (res);
+}
+/**************************************************************************
+*END_MOUNT_CDROM                                                         *
+**************************************************************************/
 
 
@@ -1387 +1501 @@
     if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
         || bkpinfo->backup_media_type == netfs) {
-        log_msg(3, "Remounting CD");
         g_ISO_restore_mode = TRUE;
-// FIXME --- I'm tempted to do something about this...
-// Why unmount and remount again and again?
-        if (is_this_device_mounted(MNT_CDROM)) {
-            run_program_and_log_output("umount " MNT_CDROM, 5);
-        }
-        sprintf(tmp, "mkdir -p %s/isodir &> /dev/null", bkpinfo->tmpdir);
-        (void)system(tmp);
-        sprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-                bkpinfo->netfs_remote_dir, bkpinfo->prefix,
-                cd_number_i_want);
-        if (!does_file_exist(tmp)) {
-            sprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir,
-                    bkpinfo->netfs_remote_dir, bkpinfo->prefix,
-                    cd_number_i_want);
-            if (does_file_exist(tmp)) {
-                log_msg(1,
-                        "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir",
-                        bkpinfo->isodir, bkpinfo->tmpdir);
-                sprintf(bkpinfo->isodir, "%s/isodir", bkpinfo->tmpdir);
-            }
-        }
-        log_msg(3, "Mounting %s at %s", tmp, MNT_CDROM);
-        if (mount_CDROM_here(tmp, MNT_CDROM)) {
-            fatal_error("Mommy!");
-        }
-//    g_current_media_number = cd_number_i_want;
-//    return;
+        if (!is_this_device_mounted(MNT_CDROM)) {
+            log_msg(3, "Mounting media");
+            g_current_media_number = cd_number_i_want;
+            mount_media();
+        }
     }
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
@@ -2655 +2746 @@
     log_it("isodir = %s", bkpinfo->isodir);
     log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
-    log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
+    if (bkpinfo->netfs_proto) {
+        log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
+    }
     if (bkpinfo->netfs_user) {
         log_it("netfs_user = '%s'", bkpinfo->netfs_user);

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -8 +8 @@
 extern int iso_fiddly_bits(bool nuke_me_please);
 extern void kill_petris(void);
-extern int mount_media();
 extern int mount_all_devices(struct mountlist_itself *, bool);
 extern void protect_against_braindead_sysadmins(void);

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

@@ -74 +74 @@
 extern void kill_anything_like_this(char *str);
 extern int skip_obdr(void);
+extern int mount_media();
 extern int set_tape_block_size_with_mt(long internal_tape_block_size);
 
@@ -579 +580 @@
 **************************************************************************/
 
-
-/**
-* Mount the CD-ROM or USB device at /mnt/cdrom.
-* @param bkpinfo The backup information structure. Fields used: 
-* - @c bkpinfo->backup_media_type
-* - @c bkpinfo->disaster_recovery
-* - @c bkpinfo->isodir
-* - @c bkpinfo->media_device
-* @return 0 for success, nonzero for failure.
-*/
-int mount_media()
-{
-char *mount_cmd;
-int i, res;
-#ifdef __FreeBSD__
-char mdd[32];
-char *mddev = mdd;
-#endif
-
-malloc_string(mount_cmd);
-assert(bkpinfo != NULL);
-
-    if (bkpinfo->backup_media_type == tape
-        || bkpinfo->backup_media_type == udev) {
-        log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
-        paranoid_free(mount_cmd);
-        return 0;
-    }
-
-    if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
-        log_msg(2, "mount_media() - media already mounted. Fair enough.");
-        paranoid_free(mount_cmd);
-        return (0);
-    }
-
-    if (bkpinfo->backup_media_type == netfs) {
-        log_msg(2, "Mounting for Network thingy");
-        log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
-            && am_I_in_disaster_recovery_mode()) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
-            log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
-        }
-#ifdef __FreeBSD__
-        sprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
-        mddev = make_vn(mount_cmd);
-        sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
-#else
-        sprintf(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);
-#endif
-
-    } else if (bkpinfo->backup_media_type == iso) {
-#ifdef __FreeBSD__
-        sprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->prefix, g_current_media_number);
-        mddev = make_vn(mount_cmd);
-        sprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
-#else
-        sprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
-#endif
-    } else if (bkpinfo->backup_media_type == usb) {
-        sprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
-    } else if (strstr(bkpinfo->media_device, "/dev/")) {
-#ifdef __FreeBSD__
-        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
-        MNT_CDROM);
-#else
-        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
-        bkpinfo->media_device, MNT_CDROM);
-#endif
-    } else {
-        if (bkpinfo->disaster_recovery
-            && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            strcpy(bkpinfo->media_device,
-                last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-        } else {
-            find_cdrom_device(bkpinfo->media_device, TRUE);
-        }
-
-#ifdef __FreeBSD__
-    sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
-        MNT_CDROM);
-#else
-    sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
-        bkpinfo->media_device, MNT_CDROM);
-#endif
-    }
-
-    log_msg(2, "(mount_media) --- command = %s", mount_cmd);
-    for (i = 0; i < 2; i++) {
-        res = run_program_and_log_output(mount_cmd, FALSE);
-        if (!res) {
-            break;
-        } else {
-            log_msg(2, "Failed to mount device.");
-            sleep(5);
-            run_program_and_log_output("sync", FALSE);
-        }
-    }
-
-    if (res) {
-        log_msg(2, "Failed, despite %d attempts", i);
-    } else {
-        log_msg(2, "Mounted media drive OK");
-    }
-    paranoid_free(mount_cmd);
-    return (res);
-}
-/**************************************************************************
-*END_MOUNT_CDROM                                                         *
-**************************************************************************/
 
 

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.h

@@ -8 +8 @@
 int iso_fiddly_bits(bool nuke_me_please);
 void kill_petris(void);
-int mount_media();
 int mount_device(char *, char *, char *, bool);
 int mount_all_devices(struct mountlist_itself *, bool);

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -50 +50 @@
 extern int partition_everything(struct mountlist_itself *mountlist);
 extern int handle_incoming_parameters(int argc, char *argv[]);
+extern int mount_media();
 
 /**
@@ -2720 +2721 @@
     }
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
+    mount_media();
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mount_media();
         mvaddstr_and_log_it(g_currentY++, 0,
                             "Restoring OS and data from streaming media");
@@ -2740 +2741 @@
         mvaddstr_and_log_it(g_currentY++, 0,
                             "Restoring OS and data from CD/USB   ");
-        mount_media();
         resA = restore_all_tarballs_from_CD(filelist);
         resB = restore_all_biggiefiles_from_CD(filelist);