Changeset 1581 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Jul 27, 2007, 2:11:55 AM (17 years ago)

Author:

Bruno Cornec

Message:

Continue to remove floppy support

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -2081 +2081 @@
 
 /**
- * Get the configuration file from the floppy, tape, or CD.
+ * Get the configuration file from the tape, or CD.
  * @param bkpinfo The backup information structure. Fields used:
  * - @c bkpinfo->backup_media_type
@@ -2122 +2122 @@
     mr_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
 
-    /* Floppy? */
-    mr_asprintf(&tmp, "mkdir -p %s", mountpt);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-
     mr_asprintf(&tmp, "mkdir -p %s/tmp", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("dmesg | grep -i floppy"));
-    if (strcmp(tmp, "")) {
-        mr_asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
-        mr_asprintf(&tmp,
-            "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
-            command);
-        mr_msg(1, "tmp = '%s'", tmp);
-        system(tmp);
-        mr_free(tmp);
-
-        res = run_program_and_log_output(command, FALSE);
-        mr_free(command);
-
-        if (res) {
-            mr_asprintf(&command, "mount /dev/fd0H1440 %s", mountpt);
-            res = run_program_and_log_output(command, FALSE);
-            mr_free(command);
-        }
-    } else {
-        res = 1;
-    }
-    if (res) {
-        try_plan_B = TRUE;
-    } else {
-        try_plan_B = TRUE;
-        mr_msg(2,
-                "Mounted floppy OK but I don't trust it because the archives might contain more up-to-date config file than the floppy does.");
-        // NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
-        mr_msg(2, "Processing floppy (plan A?)");
-        mr_asprintf(&ramdisk_fname, "%s/mindi.rdz", mountpt);
-        if (!does_file_exist(ramdisk_fname)) {
-            mr_free(ramdisk_fname);
-            mr_asprintf(&ramdisk_fname, "%s/initrd.img", mountpt);
-        }
-        if (!does_file_exist(ramdisk_fname)) {
-            mr_msg(2,
-                    "Cannot find ramdisk file on mountpoint. Are you sure that's a boot disk in the drive?");
-        }
-        if (extract_config_file_from_ramdisk
-            (bkpinfo, ramdisk_fname, cfg_file, mountlist_file)) {
-            mr_msg(2,
-                    "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
-        }
-        mr_asprintf(&command, "umount %s", mountpt);
-        run_program_and_log_output(command, 5);
-        mr_free(command);
-
-        unlink(ramdisk_fname);
-        mr_free(ramdisk_fname);
-    }
     if (!does_file_exist(cfg_file)) {
         mr_msg(2, "gcffa --- we don't have cfg file yet.");
@@ -2232 +2177 @@
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
                 log_to_screen(_
-                              ("Cannot find config info on tape/CD/floppy"));
+                              ("Cannot find config info on tape/CD"));
                 return (1);
             }
         } else {
-            /* BERLIOS : Useless ? */
-            /* That boot image doesn't always exist where the following method always works 
-            log_msg(2,
-                    "gcffa --- looking at mounted CD for mindi-boot.2880.img");
-            mr_asprintf(&command,
-                    "mount " MNT_CDROM
-                    "/images/mindi-boot.2880.img -o loop %s", mountpt);
-                    */
             mr_asprintf(&mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
             if (!does_file_exist(mounted_cfgf_path)) {