Changeset 1843 in MondoRescue

Timestamp:

Dec 18, 2007, 12:11:26 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Format (tabs) improvements
• Fix for #223 floppy detection improvement (Based on LazarusLong patch proposal)

File:

• branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (10 diffs)

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

@@ -125 +125 @@
 
 #include <pthread.h>
+#include <fd.h>
 #include "../common/my-stuff.h"
 #include "../common/mondostructures.h"
@@ -529 +530 @@
 
 /**
-* Mount @p device at @p mpt as @p format.
-* @param device The device (/dev entry) to mount.
-* @param mpt The directory to mount it on.
-* @param format The filesystem type of @p device.
-* @param writeable If TRUE, mount read-write; if FALSE, mount read-only.
-* @return 0 for success, nonzero for failure.
-*/
+ * Mount @p device at @p mpt as @p format.
+ * @param device The device (/dev entry) to mount.
+ * @param mpt The directory to mount it on.
+ * @param format The filesystem type of @p device.
+ * @param writeable If TRUE, mount read-write; if FALSE, mount read-only.
+ * @return 0 for success, nonzero for failure.
+ */
 int mount_device(char *device, char *mpt, char *format, bool writeable)
 {
@@ -552 +553 @@
 malloc_string(additional_parameters);
 
-if (!strcmp(mpt, "/1")) {
-    strcpy(mountpoint, "/");
-    log_msg(3, "Mommm! SME is being a dildo!");
-} else {
-    strcpy(mountpoint, mpt);
-}
-
-if (!strcmp(mountpoint, "lvm")) {
-    return (0);
-}
-if (!strcmp(mountpoint, "image")) {
-    return (0);
-}
-sprintf(tmp, "Mounting device %s   ", device);
-log_msg(1, tmp);
-if (writeable) {
-    strcpy(additional_parameters, "-o rw");
-} else {
-    strcpy(additional_parameters, "-o ro");
-}
-if (find_home_of_exe("setfattr")) {
-    strcat(additional_parameters, ",user_xattr");
-}
-if (find_home_of_exe("setfacl")) {
-    strcat(additional_parameters, ",acl");
-}
-
-if (!strcmp(mountpoint, "swap")) {
-    sprintf(command, "swapon %s", device);
-} else {
-if (!strcmp(mountpoint, "/")) {
-    strcpy(mountdir, MNT_RESTORING);
-} else {
-    sprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
-}
-sprintf(command, "mkdir -p %s", mountdir);
-run_program_and_log_output(command, FALSE);
-sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
-        additional_parameters, mountdir, MONDO_LOGFILE);
-log_msg(2, "command='%s'", command);
-}
-res = run_program_and_log_output(command, TRUE);
-if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
-    log_msg(1, "Re-trying without the fancy extra parameters");
-    sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
-        mountdir, MONDO_LOGFILE);
+    if (!strcmp(mpt, "/1")) {
+        strcpy(mountpoint, "/");
+        log_msg(3, "Mommm! SME is being a dildo!");
+    } else {
+        strcpy(mountpoint, mpt);
+    }
+
+    if (!strcmp(mountpoint, "lvm")) {
+        return (0);
+    }
+    if (!strcmp(mountpoint, "image")) {
+        return (0);
+    }
+    sprintf(tmp, "Mounting device %s   ", device);
+    log_msg(1, tmp);
+    if (writeable) {
+        strcpy(additional_parameters, "-o rw");
+    } else {
+        strcpy(additional_parameters, "-o ro");
+    }
+    if (find_home_of_exe("setfattr")) {
+        strcat(additional_parameters, ",user_xattr");
+    }
+    if (find_home_of_exe("setfacl")) {
+        strcat(additional_parameters, ",acl");
+    }
+
+    if (!strcmp(mountpoint, "swap")) {
+        sprintf(command, "swapon %s", device);
+    } else {
+        if (!strcmp(mountpoint, "/")) {
+            strcpy(mountdir, MNT_RESTORING);
+        } else {
+            sprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
+        }
+        sprintf(command, "mkdir -p %s", mountdir);
+        run_program_and_log_output(command, FALSE);
+        sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
+                additional_parameters, mountdir, MONDO_LOGFILE);
+        log_msg(2, "command='%s'", command);
+    }
+
     res = run_program_and_log_output(command, TRUE);
-}
-if (res) {
-    log_msg(1, "Unable to mount device %s (type %s) at %s", device,
-        format, mountdir);
-    log_msg(1, "command was '%s'", command);
-    if (!strcmp(mountpoint, "swap")) {
-        log_to_screen(tmp);
-    } else {
-        log_msg(2, "Retrying w/o the '-t' switch");
-        sprintf(command, "mount %s %s 2>> %s", device, mountdir,
-            MONDO_LOGFILE);
-        log_msg(2, "2nd command = '%s'", command);
+    if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
+        log_msg(1, "Re-trying without the fancy extra parameters");
+        sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
+            mountdir, MONDO_LOGFILE);
         res = run_program_and_log_output(command, TRUE);
-        if (res == 0) {
-            log_msg(1,
-                "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
+    }
+    if (res) {
+        log_msg(1, "Unable to mount device %s (type %s) at %s", device,
+                format, mountdir);
+        log_msg(1, "command was '%s'", command);
+        if (!strcmp(mountpoint, "swap")) {
+            log_to_screen(tmp);
         } else {
-            log_to_screen(tmp);
-        }
-    }
-}
-if (res && !strcmp(mountpoint, "swap")) {
-    log_msg(2, "That's ok. It's just a swap partition.");
-    log_msg(2, "Non-fatal error. Returning 0.");
-    res = 0;
-}
+            log_msg(2, "Retrying w/o the '-t' switch");
+            sprintf(command, "mount %s %s 2>> %s", device, mountdir,
+                MONDO_LOGFILE);
+            log_msg(2, "2nd command = '%s'", command);
+            res = run_program_and_log_output(command, TRUE);
+            if (res == 0) {
+                log_msg(1,
+                    "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
+            } else {
+                log_to_screen(tmp);
+            }
+        }
+    }
+
+    if (res && !strcmp(mountpoint, "swap")) {
+        log_msg(2, "That's ok. It's just a swap partition.");
+        log_msg(2, "Non-fatal error. Returning 0.");
+        res = 0;
+    }
 
 paranoid_free(tmp);
@@ -632 +635 @@
 paranoid_free(additional_parameters);
 
-return (res);
-}
-
+    return (res);
+}
 /**************************************************************************
-*END_MOUNT_DEVICE                                                        *
+ *END_MOUNT_DEVICE                                                        *
 **************************************************************************/
 
 
 /**
-* Mount all devices in @p p_external_copy_of_mountlist on @p MNT_RESTORING.
-* @param p_external_copy_of_mountlist The mountlist containing devices to be mounted.
-* @param writeable If TRUE, then mount read-write; if FALSE mount read-only.
-* @return The number of errors encountered (0 for success).
-*/
+ * Mount all devices in @p p_external_copy_of_mountlist on @p MNT_RESTORING.
+ * @param p_external_copy_of_mountlist The mountlist containing devices to be mounted.
+ * @param writeable If TRUE, then mount read-write; if FALSE mount read-only.
+ * @return The number of errors encountered (0 for success).
+ */
 int mount_all_devices(struct mountlist_itself
-              *p_external_copy_of_mountlist, bool writeable)
+                      *p_external_copy_of_mountlist, bool writeable)
 {
 int retval = 0, lino, res;
 char *tmp, *these_failed, *format;
-struct mountlist_itself *mountlist;
+    struct mountlist_itself *mountlist = NULL;
 
 malloc_string(tmp);
 malloc_string(format);
 malloc_string(these_failed);
+/** menset **/
+these_failed[0] = '\0';
+
 assert(p_external_copy_of_mountlist != NULL);
 mountlist = malloc(sizeof(struct mountlist_itself));
 memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
    sizeof(struct mountlist_itself));
-sort_mountlist_by_mountpoint(mountlist, 0);
-
-/** menset **/
-these_failed[0] = '\0';
-
-mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
-open_progress_form("Mounting devices",
+    sort_mountlist_by_mountpoint(mountlist, 0);
+
+
+    mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
+    open_progress_form("Mounting devices",
                "I am now mounting all the drives.",
                "This should not take long.",
                "", mountlist->entries);
 
-for (lino = 0; lino < mountlist->entries; lino++) {
-if (!strcmp(mountlist->el[lino].device, "/proc")) {
-    log_msg(1,
-            "Again with the /proc - why is this in your mountlist?");
-} else if (is_this_device_mounted(mountlist->el[lino].device)) {
-    sprintf(tmp, "%s is already mounted",
-            mountlist->el[lino].device);
-    log_to_screen(tmp);
-} else if (strcmp(mountlist->el[lino].mountpoint, "none")
+    for (lino = 0; lino < mountlist->entries; lino++) {
+        if (!strcmp(mountlist->el[lino].device, "/proc")) {
+            log_msg(1,
+                "Again with the /proc - why is this in your mountlist?");
+        } else if (is_this_device_mounted(mountlist->el[lino].device)) {
+            sprintf(tmp, "%s is already mounted",
+                mountlist->el[lino].device);
+            log_to_screen(tmp);
+        } else if (strcmp(mountlist->el[lino].mountpoint, "none")
            && strcmp(mountlist->el[lino].mountpoint, "lvm")
            && strcmp(mountlist->el[lino].mountpoint, "raid")
            && strcmp(mountlist->el[lino].mountpoint, "image")) {
-    sprintf(tmp, "Mounting %s", mountlist->el[lino].device);
-    update_progress_form(tmp);
-    strcpy(format, mountlist->el[lino].format);
-    /* BERLIOS: removed as it doen't make sens to not mount ext3 partitions as ext3
-    if (!strcmp(format, "ext3")) {
-        strcpy(format, "ext2");
-    }
-    */
-    res = mount_device(mountlist->el[lino].device,
+            sprintf(tmp, "Mounting %s", mountlist->el[lino].device);
+            update_progress_form(tmp);
+            strcpy(format, mountlist->el[lino].format);
+            /* BERLIOS: removed as it doen't make sens to not mount ext3 partitions as ext3
+            if (!strcmp(format, "ext3")) {
+                strcpy(format, "ext2");
+            }
+            */
+            res = mount_device(mountlist->el[lino].device,
                        mountlist->el[lino].mountpoint,
                        format, writeable);
-    retval += res;
-    if (res) {
-        strcat(these_failed, mountlist->el[lino].device);
-        strcat(these_failed, " ");
-    }
-}
-g_current_progress++;
-}
-close_progress_form();
-if (retval) {
-if (g_partition_table_locked_up > 0) {
-    log_to_screen
-        ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
-    log_to_screen
-        ("lock up the partition table. You might have to reboot and use Interactive Mode to");
-    log_to_screen
-        ("format and restore *without* partitioning first. Sorry for the inconvenience.");
-}
-sprintf(tmp, "Could not mount device(s) %s- shall I abort?",
-        these_failed);
-if (!ask_me_yes_or_no(tmp)) {
-    retval = 0;
-    log_to_screen
-        ("Continuing, although some device(s) failed to be mounted");
-    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-} else {
-    mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-    log_to_screen
+            retval += res;
+            if (res) {
+                strcat(these_failed, mountlist->el[lino].device);
+                strcat(these_failed, " ");
+            }
+        }
+        g_current_progress++;
+    }
+    close_progress_form();
+    if (retval) {
+        if (g_partition_table_locked_up > 0) {
+            log_to_screen
+                ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
+            log_to_screen
+                ("lock up the partition table. You might have to reboot and use Interactive Mode to");
+            log_to_screen
+                ("format and restore *without* partitioning first. Sorry for the inconvenience.");
+        }
+        sprintf(tmp, "Could not mount device(s) %s- shall I abort?",
+                these_failed);
+
+        if (!ask_me_yes_or_no(tmp)) {
+            retval = 0;
+            log_to_screen
+                ("Continuing, although some device(s) failed to be mounted");
+            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        } else {
+            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+            log_to_screen
         ("Unable to mount some or all of your partitions.");
-}
-} else {
-log_to_screen("All partitions were mounted OK.");
-mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-}
-run_program_and_log_output("df -m", 3);
-paranoid_free(mountlist);
-paranoid_free(tmp);
-paranoid_free(format);
-paranoid_free(these_failed);
-return (retval);
-}
-
+        }
+    } else {
+        log_to_screen("All partitions were mounted OK.");
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    run_program_and_log_output("df -m", 3);
+    paranoid_free(mountlist);
+    paranoid_free(tmp);
+    paranoid_free(format);
+    paranoid_free(these_failed);
+    return (retval);
+}
 /**************************************************************************
 *END_MOUNT_ALL_DEVICES                                                   *
@@ -762 +765 @@
 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 == nfs) {
-    log_msg(2, "Mounting for NFS 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);
-    }
+    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 == nfs) {
+        log_msg(2, "Mounting for NFS 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->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
-    mddev = make_vn(mount_cmd);
-    sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        sprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
+            bkpinfo->nfs_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->nfs_remote_dir,
-        bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        sprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
+            bkpinfo->isodir, bkpinfo->nfs_remote_dir,
+            bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
-} else if (bkpinfo->backup_media_type == iso) {
+    } 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);
+        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);
+        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) {
+    } 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/")) {
+    } else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
         sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
@@ -814 +817 @@
         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);
-    }
+        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__
@@ -830 +833 @@
         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 CD-ROM drive OK");
-}
-paranoid_free(mount_cmd);
-return (res);
-}
-
-
-
-
-
+    }
+
+    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                                                         *
@@ -1246 +1245 @@
 
 /**
-* Allow the user to edit the filelist and biggielist.
-* The filelist is unlinked after it is read.
-* @param bkpinfo The backup information structure. Fields used:
-* - @c bkpinfo->backup_media_type
-* - @c bkpinfo->isodir
-* - @c bkpinfo->media_device
-* - @c bkpinfo->tmpdir
-* @return The filelist structure containing the information read from disk.
-*/
+ * Allow the user to edit the filelist and biggielist.
+ * The filelist is unlinked after it is read.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->backup_media_type
+ * - @c bkpinfo->isodir
+ * - @c bkpinfo->media_device
+ * - @c bkpinfo->tmpdir
+ * @return The filelist structure containing the information read from disk.
+ */
 struct
 s_node *process_filelist_and_biggielist()
@@ -2311 +2310 @@
     char *ramdisk_fname;
     char *mountlist_file;
-    int res;
+    int res = 0;
+    int fd = 0;
+    struct floppy_struct fdprms;
 
     bool try_plan_B;
@@ -2353 +2354 @@
 
     /* Is there a floppy drive detected */
-    sprintf(tmp, "%s", call_program_and_get_last_line_of_output("dmesg | grep -i floppy"));
-    if (strcmp(tmp, "")) {
-        sprintf(command, "mount /dev/fd0u1722 %s", mountpt);
-        sprintf(tmp,
-            "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
-            command);
-        log_msg(1, "tmp = '%s'", tmp);
-        system(tmp);
-        res = run_program_and_log_output(command, FALSE);
-        if (res) {
-            sprintf(command, "mount /dev/fd0H1440 %s", mountpt);
+    fd = open("/dev/fd0u1722", O_RDONLY);
+    if (fd > 0) {
+        // open OK
+        res = ioctl(fd, FDGETPRM, &fdprms);
+        if (res >= 0) {
+            // media OK to mount 
+            sprintf(command, "mount /dev/fd0u1722 %s", mountpt);
             res = run_program_and_log_output(command, FALSE);
-        }
-    } else {
-        res = 1;
+        } else {
+            //skip mount 
+            res = 1;
+        } 
+    } else { 
+        fd = open("/dev/fd0H1440", O_RDONLY);
+        if (fd > 0) {
+            // open OK
+            res = ioctl(fd, FDGETPRM, &fdprms);
+            if (res >= 0) {
+                // media OK to mount 
+                sprintf(command, "mount /dev/fd0H1440 %s", mountpt);
+                res = run_program_and_log_output(command, FALSE);
+            } else {
+                //skip mount 
+                res = 1;
+            } 
+        }
     }
     if (res) {