Changeset 1885 in MondoRescue for branches/2.2.5/mondo/src/mondorestore

Timestamp:

Mar 2, 2008, 12:38:35 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Remove floppy support from mindi and mondo and adapt docs
• Align more mindi with the version from stable

Location:

branches/2.2.5/mondo/src/mondorestore

Files:

• mondo-restore.c (modified) (4 diffs)
• mondo-rstr-tools.c (modified) (3 diffs)

branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

@@ -141 +141 @@
  * The message to display if we detect that the user is using a Compaq Proliant.
  */
-#define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode."
+#define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo media in Interactive Mode."
 
 
@@ -928 +928 @@
     if (!g_restoring_live_from_cd) {
         popup_and_OK
-            ("Please insert tape/CD/USB Key/boot floppy, then hit 'OK' to continue.");
+            ("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
         sleep(1);
     }
@@ -2937 +2937 @@
 
     run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
-    run_program_and_log_output("mkdir -p /mnt/floppy", FALSE);
 
     malloc_string(tmp);
@@ -3274 +3273 @@
             mvaddstr_and_log_it(g_currentY++,
                                 0,
-                                "Run complete. Please remove floppy/CD/media and reboot.");
+                                "Run complete. Please remove media and reboot.");
         } else {
             run_program_and_log_output("sync", FALSE);

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

@@ -2313 +2313 @@
     int res = 0;
     int fd = 0;
-    struct floppy_struct fdprms;
 
     bool try_plan_B;
@@ -2348 +2347 @@
     log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
 
-    /* Floppy? */
-    sprintf(tmp, "mkdir -p %s", mountpt);
-    run_program_and_log_output(tmp, FALSE);
-    sprintf(tmp, "mkdir -p %s/tmp", bkpinfo->tmpdir);
-    run_program_and_log_output(tmp, FALSE);
-
-    /* Is there a floppy drive detected */
-    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 {
-            //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) {
-        try_plan_B = TRUE;
-    } else {
-        try_plan_B = TRUE;
-        log_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.
-        log_msg(2, "Processing floppy (plan A?)");
-        sprintf(ramdisk_fname, "%s/mindi.rdz", mountpt);
-        if (!does_file_exist(ramdisk_fname)) {
-            sprintf(ramdisk_fname, "%s/initrd.img", mountpt);
-        }
-        if (!does_file_exist(ramdisk_fname)) {
-            log_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(ramdisk_fname, cfg_file, mountlist_file)) {
-            log_msg(2,
-                    "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
-        }
-        sprintf(command, "umount %s", mountpt);
-        run_program_and_log_output(command, 5);
-        unlink(ramdisk_fname);
-    }
     if (!does_file_exist(cfg_file)) {
         log_msg(2, "gcffa --- we don't have cfg file yet.");
@@ -2453 +2394 @@
 
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
-                log_to_screen("Cannot find config info on tape/CD/floppy");
+                log_to_screen("Cannot find config info on media");
                 return (1);
             }