Changeset 1581 in MondoRescue for branches/stable/mondo

Timestamp:

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

Author:

Bruno Cornec

Message:

Continue to remove floppy support

Location:

branches/stable/mondo

Files:

• distributions/debian/README.Debian (modified) (2 diffs)
• po/fr.po (modified) (6 diffs)
• src/common/libmondo-archive.c (modified) (6 diffs)
• src/common/libmondo-devices.c (modified) (1 diff)
• src/mondoarchive/mondo-cli.c (modified) (1 diff)
• src/mondoarchive/mondoarchive.c (modified) (2 diffs)
• src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)
• src/mondorestore/mondorestore.c (modified) (4 diffs)

branches/stable/mondo/distributions/debian/README.Debian

@@ -7 +7 @@
 This is not the official Debian package of mondo but the upstream
 version. Please to not report errors to the Debian Bug Tracking
-System but to <the mailing list>. Thnak you.
+System but to <the mailing list>. Thank you.
 
 IMPORTANT +++ IMPORTANT +++ IMPORTANT +++ IMPORTANT +++ IMPORTANT
@@ -108 +108 @@
 
 
-Using floppy disks as rescue media
-----------------------------------
-
-mondoarchive will offer to write a set of rescue floppies (unless the '-F'
-switch is used). These floppy disks will only work with the FAILSAFE kernel. The
-reason is that stock Debian kernels don't have the floppy driver built into the
-kernel and that the kernel is too large for one floppy with an initrd and a
-kernel image. Because of the space issue, mondoarchiv (or rather mindi) creates
-a root/boot floppy set. Because the stock kernel does not have floppy support
-compiled in a kernel panic results when trying to acces the second (the root)
-floppy.
-
-Also, building the boot/root floppy images requires that lilo is installed on
-the system. This does not mean that it actually needs to be used to boot the
-system, only that the package is installed. (Because most people won't need the
-boot/root floppies, the mindi package only suggests the lilo package.)
-
-Finally a word of caution: Floppy disks are notoriously unreliable. Dont't use
-them unless you really really have to. (A CD writer costs the same as a few
-boxes of floppy disks these days.)
-
-
  -- Andree Leidenfrost <aleidenf@bigpond.net.au>  Sun,  8 Jan 2005 15:20:05 +1100

branches/stable/mondo/po/fr.po

@@ -1148 +1148 @@
 
 #: ../src/mondorestore/mondo-rstr-tools.c:2223
-msgid "Cannot find config info on tape/CD/floppy"
+msgid "Cannot find config info on tape/CD"
 msgstr "Impossible de trouver des infos de configuration sur CD/tape..."
 
@@ -1286 +1286 @@
 msgid ""
 "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 "
+"you've done that, please reboot with your Mondo CD in Interactive "
 "Mode."
 msgstr ""
@@ -1523 +1523 @@
 
 #: ../src/mondorestore/mondorestore.c:887
-msgid "Please insert tape/CD/boot floppy, then hit 'OK' to continue."
-msgstr "Insérez le CD/bande/disquette puis appuyez sur 'OK'"
+msgid "Please insert tape/CD, then hit 'OK' to continue."
+msgstr "Insérez le CD/bande puis appuyez sur 'OK'"
 
 #: ../src/mondorestore/mondorestore.c:900
@@ -1707 +1707 @@
 
 #: ../src/mondorestore/mondorestore.c:3160
-msgid "Run complete. Please remove floppy/CD/media and reboot."
-msgstr "Terminé. Enlevez le/a disauette/CD/media et rebootez."
+msgid "Run complete. Please remove CD/media and reboot."
+msgstr "Terminé. Enlevez le CD/media et rebootez."
 
 #: ../src/mondorestore/mondorestore.c:3175
@@ -1968 +1968 @@
 
 #: ../src/common/libmondo-devices.c:1457
-msgid "Please remove CD/floppy from drive(s)"
-msgstr "Veuillez enlevez le CD ou la disquette du lecteur"
+msgid "Please remove CD from drive"
+msgstr "Veuillez enlevez le CD du lecteur"
 
 #: ../src/common/libmondo-devices.c:1480
@@ -2677 +2677 @@
 
 #: ../src/mondoarchive/mondo-cli.c:842
-msgid "using LILO instead of SYSLINUX as the CD/floppy's boot loader."
-msgstr "LILO au lieu de SYSLINUX comme chargeur d'amorçage pour votre CD/Floppy"
+msgid "using LILO instead of SYSLINUX as the CD boot loader."
+msgstr "LILO au lieu de SYSLINUX comme chargeur d'amorçage pour votre CD"
 
 #: ../src/mondoarchive/mondo-cli.c:848

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

@@ -44 +44 @@
 extern struct mr_ar_conf *mr_conf;
 
-
-
-/** @def DEFAULT_1722MB_DISK The default 1.722M floppy disk to write images to. */
-/** @def BACKUP_1722MB_DISK  The 1.722M floppy disk to try if the default fails. */
-
-#ifdef __FreeBSD__
-#define DEFAULT_1722MB_DISK "/dev/fd0.1722"
-#define BACKUP_1722MB_DISK "/dev/fd0.1722"
-#else
-#define DEFAULT_1722MB_DISK "/dev/fd0u1722"
-#define BACKUP_1722MB_DISK "/dev/fd0H1722"
+#ifndef __FreeBSD__
 #ifndef _SEMUN_H
 #define _SEMUN_H
@@ -67 +57 @@
     struct seminfo *__buf;
 };
-#endif
 #endif                          /* __FreeBSD__ */
 
@@ -793 +782 @@
         res++;
         log_OS_error("Unable to make images directory");
-    }
-    mr_free(command);
-
-    mr_asprintf(&command, "mkdir -p %s%s", bkpinfo->scratchdir, MNT_FLOPPY);
-    if (system(command)) {
-        res++;
-        log_OS_error("Unable to make mnt floppy directory");
     }
     mr_free(command);
@@ -1307 +1289 @@
     }
     return (retval);
-}
-
-
-/**
- * Calls floppy-formatting @c cmd and tracks its progress if possible.
- *
- * @param cmd The command to run (e.g. @c fdformat @c /dev/fd0).
- * @param title The human-friendly description of the floppy you are writing.
- * This will be used as the title in the progress bar window. Example:
- * "Formatting disk /dev/fd0".
- * @see format_disk
- * @return The exit code of fdformat/superformat.
- */
-int format_disk_SUB(char *cmd, char *title)
-{
-
-    /*@ int *************************************************************** */
-    int res = 0;
-    int percentage = 0;
-    int maxtracks = 0;
-    int trackno = 0;
-    int last_trkno = 0;
-
-    /*@ buffers *********************************************************** */
-    char *command = NULL;
-    char *tempfile;
-
-    /*@ pointers ********************************************************** */
-    FILE *pin;
-
-    assert_string_is_neither_NULL_nor_zerolength(cmd);
-    assert_string_is_neither_NULL_nor_zerolength(title);
-
-    malloc_string(tempfile);
-#ifdef __FreeBSD__
-/* Ugh. FreeBSD fdformat prints out this pretty progress indicator that's
-   impossible to parse. It looks like
-   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVF-------------------
-   where V means verified, E means error, F means formatted, and - means
-   not done yet.
-*/
-    return (run_program_and_log_to_screen(cmd, title));
-#endif
-
-/* if Debian then do bog-standard superformat; don't be pretty */
-    if (strstr(cmd, "superformat")) {
-        return (run_program_and_log_to_screen(cmd, title));
-    }
-/* if not Debian then go ahead & use fdformat */
-    strcpy(tempfile,
-           call_program_and_get_last_line_of_output
-           ("mktemp -q /tmp/mondo.XXXXXXXX"));
-    mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile, tempfile);
-    mr_msg(3, command);
-    open_evalcall_form(title);
-    if (!(pin = popen(command, "r"))) {
-        log_OS_error("fmt err");
-        return (1);
-    }
-    if (strstr(command, "1722")) {
-        maxtracks = 82;
-    } else {
-        maxtracks = 80;
-    }
-    mr_free(command);
-
-    for (sleep(1); does_file_exist(tempfile); sleep(1)) {
-        trackno = get_trackno_from_logfile(tempfile);
-        if (trackno < 0 || trackno > 80) {
-            mr_msg(1, "Weird track#");
-            continue;
-        }
-        percentage = trackno * 100 / maxtracks;
-        if (trackno <= 5 && last_trkno > 40) {
-            close_evalcall_form();
-            strcpy(title, "Verifying format");
-            open_evalcall_form(title);
-        }
-        last_trkno = trackno;
-        update_evalcall_form(percentage);
-    }
-    close_evalcall_form();
-    if (pclose(pin)) {
-        res++;
-        log_OS_error("Unable to pclose");
-    }
-    unlink(tempfile);
-    mr_free(tempfile);
-    return (res);
-}
-
-
-/**
- * Wrapper around @c format_disk_SUB().
- * This function calls @c format_disk_SUB() with a @c device of its @c device
- * parameter and a @c title of Formatting disk @c device. If the format
- * fails, the user will be given the option of retrying.
- *
- * @param device The floppy drive to write to.
- * @see format_disk_SUB
- * @return The exit code of fdformat/superformat.
- * @ingroup deviceGroup
- */
-int format_disk(char *device)
-{
-
-    /*@ int ************************************************************** */
-    int res = 0;
-
-    /*@ buffer *********************************************************** */
-    char *command;
-    char *title;
-
-    assert_string_is_neither_NULL_nor_zerolength(device);
-
-    if (!system("which superformat > /dev/null 2> /dev/null")) {
-        mr_asprintf(&command, "superformat %s", device);
-    } else {
-#ifdef __FreeBSD__
-        mr_asprintf(&command, "fdformat -y %s", device);
-#else
-        mr_asprintf(&command, "fdformat %s", device);
-#endif
-    }
-    mr_asprintf(&title, "Formatting disk %s", device);
-    while ((res = format_disk_SUB(command, title))) {
-        if (!ask_me_yes_or_no("Failed to format disk. Retry?")) {
-            return (res);
-        }
-    }
-    mr_free(title);
-    mr_free(command);
-    return (res);
 }
 
@@ -2607 +2456 @@
 
 /**
- * Offer to write boot and data disk images to 3.5" floppy disks.
- * @param bkpinfo The backup information structure. Only the
- * @c backup_media_type field is used in this function.
- * @param imagesdir The directory containing the floppy images (usually
- * /var/cache/mindi).
- *
- * @return The number of errors encountered (0 for success)
- * @see write_image_to_floppy
- * @see format_disk
- * @ingroup MLarchiveGroup
- */
-int offer_to_write_floppies(struct s_bkpinfo *bkpinfo, char *imagesdir)
-{
-    /*@ buffer ************************************************************ */
-    char *tmp = NULL;
-    char *comment = NULL;
-    char *bootdisk_dev =NULL;
-    char *datadisk_dev = NULL;
-    char *bootdisk_file = NULL;
-    char *rootdisk_file = NULL;
-
-    /*@ int *************************************************************** */
-    int i = 0;
-    int res = 0;
-
-    /*@ bool ************************************************************** */
-    bool format_first;
-    bool root_disk_exists = FALSE;
-
-    assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(imagesdir);
-
-    if (!ask_me_yes_or_no
-        ("Write boot and data disk images to 3.5\" floppy disks?")) {
-        return (0);
-    }
-    if (does_device_exist(DEFAULT_1722MB_DISK)) {
-#ifdef __FreeBSD__
-        // tell the system that this is a 1.72m floppy
-        system("/usr/sbin/fdcontrol -F 1722 /dev/fd0.1722");
-#endif
-        mr_asprintf(&bootdisk_dev, DEFAULT_1722MB_DISK);
-    } else if (does_device_exist(BACKUP_1722MB_DISK)) {
-        mr_asprintf(&bootdisk_dev, "/dev/fd0H1722");
-    } else {
-        mr_msg(1, "Warning - can't find a 1.72MB floppy device *sigh*");
-        mr_asprintf(&bootdisk_dev, DEFAULT_1722MB_DISK);
-    }
-    mr_asprintf(&datadisk_dev, "/dev/fd0");
-    if (!does_device_exist(datadisk_dev)) {
-        mr_msg(1, "Warning - can't find a 1.44MB floppy device *sigh*");
-    }
-    format_first = ask_me_yes_or_no
-        ("Do you want me to format the disks before I write to them?");
-
-    /* boot disk */
-    if (ask_me_OK_or_cancel("About to write boot disk")) {
-        log_to_screen("Writing boot floppy");
-#ifdef __FreeBSD__
-        mr_asprintf(&tmp, "%s/mindi-kern.1722.img", imagesdir);
-        if (format_first) {
-            format_disk(bootdisk_dev);
-        }
-        res += write_image_to_floppy(bootdisk_dev, tmp);
-        mr_free(tmp);
-
-        if (ask_me_OK_or_cancel("About to write 1.44MB mfsroot disk")) {
-            log_to_screen("Writing mfsroot floppy");
-            if (format_first) {
-                format_disk(datadisk_dev);
-            }
-            mr_asprintf(&tmp, "%s/mindi-mfsroot.1440.img", imagesdir);
-            write_image_to_floppy(datadisk_dev, tmp);
-            mr_free(tmp);
-        }
-#else
-        mr_asprintf(&bootdisk_file, "%s/mindi-bootroot.1722.img", imagesdir);
-        if (does_file_exist(bootdisk_file)) {
-            if (format_first) {
-                format_disk(bootdisk_dev);
-            }
-            res += write_image_to_floppy(bootdisk_dev, bootdisk_file);
-        } else {
-            mr_free(bootdisk_file);
-            mr_asprintf(&bootdisk_file, "%s/mindi-boot.1440.img", imagesdir);
-            mr_asprintf(&rootdisk_file, "%s/mindi-root.1440.img", imagesdir);
-            root_disk_exists = TRUE;
-            if (!does_file_exist(rootdisk_file)
-                || !does_file_exist(bootdisk_file)) {
-                popup_and_OK
-                    ("Cannot write boot/root floppies. Files not found.");
-                log_to_screen
-                    ("Failed to find boot/root floppy images. Oh dear.");
-                mr_free(bootdisk_file);
-                mr_free(rootdisk_file);
-                mr_free(bootdisk_dev);
-                return (1);
-            }
-            if (format_first) {
-                format_disk(datadisk_dev);
-            }
-            res += write_image_to_floppy(datadisk_dev, bootdisk_file);
-            if (ask_me_OK_or_cancel("About to write root disk")) {
-                log_to_screen("Writing root floppy");
-                if (format_first) {
-                    format_disk(datadisk_dev);
-                }
-                mr_asprintf(&tmp, "cat %s > %s", rootdisk_file, datadisk_dev);
-                mr_msg(1, "tmp = '%s'", tmp);
-                res +=
-                    run_external_binary_with_percentage_indicator_NEW
-                    ("Writing root floppy", tmp);
-//              res += write_image_to_floppy (datadisk_dev, rootdisk_file);
-                mr_free(tmp);
-            }
-            mr_free(rootdisk_file);
-            
-        }
-        mr_free(bootdisk_file);
-#endif
-    }
-    mr_free(bootdisk_dev);
-
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        log_to_screen
-            ("FYI, the data disks are stored on tape/CD for your convenience.");
-        return (0);
-    }
-    for (i = 1; i < 99; i++) {
-        mr_asprintf(&tmp, "%s/mindi-data-%d.img", imagesdir, i);
-        mr_msg(3, tmp);
-        if (!does_file_exist(tmp)) {
-            mr_msg(3, "...not found");
-            break;
-        }
-        mr_asprintf(&comment, "About to write data disk #%d", i);
-        if (ask_me_OK_or_cancel(comment)) {
-            mr_free(comment);
-            mr_asprintf(&comment, "Writing data disk #%3d", i);
-            log_to_screen(comment);
-            mr_free(comment);
-            if (format_first) {
-                res += format_disk(datadisk_dev);
-            }
-            res += write_image_to_floppy(datadisk_dev, tmp);
-        }
-        mr_free(tmp);
-    }
-    /* In case of break free mem as well */
-    mr_free(tmp);
-    mr_free(datadisk_dev);
-    return (res);
-}
-
-
-/**
- * Wrapper around @c offer_to_write_floppies().
- * @param bkpinfo The backup information structure. Used only
- * in the call to @c offer_to_write_floppies().
- * @return 0 if the boot floppies were found (not necessarily written OK),
- * 1 otherwise.
- * @see offer_to_write_floppies
- * @ingroup MLarchiveGroup
- */
-
-int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo *bkpinfo) {
-    
-    int res = 0;
-
-    assert(bkpinfo != NULL);
-
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Writing boot+data floppy images to disk");
-
-    if (!bkpinfo->nonbootable_backup) {
-#ifdef __FreeBSD__
-        if (!does_file_exist(MINDI_CACHE"/mindi-kern.1722.img"))
-#else
-        /* BERLIOS: To be improved */
-        if (!does_file_exist(MINDI_CACHE"/mindi-bootroot.1722.img")
-            && !does_file_exist(MINDI_CACHE"/mindi-boot.1440.img")
-            && !does_file_exist(MINDI_CACHE"/mindi-boot.2880.img")
-            && !does_file_exist(MINDI_CACHE"/mindi-boot.5760.img")
-            && !does_file_exist(MINDI_CACHE"/mindi-boot.8192.img"))
-#endif
-        {
-            mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
-            if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
-                popup_and_OK
-                    ("Boot+data floppy creation failed. However, FYI, you may burn "MINDI_CACHE"/mondorescue.iso to a CD and boot from that instead if you wish.");
-                res++;
-            }
-        } else {
-            offer_to_write_floppies(bkpinfo, MINDI_CACHE);
-            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-        }
-    } else {
-        popup_and_OK
-            ("Since you opted for a nonbootable backup, no boot floppies were created.");
-    }
-
-    return (res);
-}
-
-
-/**
  * @addtogroup LLarchiveGroup
  * @{
@@ -3812 +3455 @@
 
 
-/**
- * @addtogroup utilityGroup
- * @{
- */
-/**
- * Write an image to a real 3.5" floppy disk.
- * @param device The device to write to (e.g. @c /dev/fd0)
- * @param datafile The image to write to @p device.
- * @return The number of errors encountered (0 for success)
- * @see write_image_to_floppy
- */
-int write_image_to_floppy_SUB(char *device, char *datafile)
-{
-    /*@ int *************************************************************** */
-    int res = 0;
-    int percentage = 0;
-    int blockno = 0;
-    int maxblocks = 0;
-
-    /*@ buffers************************************************************ */
-    char *tmp;
-    char blk[1024];
-    char *title;
-
-    /*@ pointers ********************************************************** */
-    char *p;
-    FILE *fout, *fin;
-
-
-    /* pretty stuff */
-    if (!(p = strrchr(datafile, '/'))) {
-        p = datafile;
-    } else {
-        p++;
-    }
-    mr_asprintf(&title, "Writing %s to floppy", p);
-    open_evalcall_form(title);
-    mr_free(title);
-
-    /* functional stuff */
-    for (p = device + strlen(device); p != device && isdigit(*(p - 1));
-         p--);
-    maxblocks = atoi(p);
-    if (!maxblocks) {
-        maxblocks = 1440;
-    }
-    mr_asprintf(&tmp, "maxblocks = %d; p=%s", maxblocks, p);
-    mr_msg(2, tmp);
-    mr_free(tmp);
-
-    /* copy data from image to floppy */
-    if (!(fin = fopen(datafile, "r"))) {
-        log_OS_error("Cannot open img");
-        return (1);
-    }
-    if (!(fout = fopen(device, "w"))) {
-        log_OS_error("Cannot open fdd");
-        return (1);
-    }
-    for (blockno = 0; blockno < maxblocks; blockno++) {
-        percentage = blockno * 100 / maxblocks;
-        if (fread(blk, 1, 1024, fin) != 1024) {
-            if (feof(fin)) {
-                mr_msg(1,
-                        "img read err - img ended prematurely - non-fatal error");
-                sleep(3);
-                return (res);
-            }
-            res++;
-            log_to_screen("img read err");
-        }
-        if (fwrite(blk, 1, 1024, fout) != 1024) {
-            res++;
-            log_to_screen("fdd write err");
-        }
-        if (((blockno + 1) % 128) == 0) {
-            sync(); /* fflush doesn't work; dunno why */
-            update_evalcall_form(percentage);
-        }
-    }
-    paranoid_fclose(fin);
-    paranoid_fclose(fout);
-    close_evalcall_form();
-    return (res);
-}
-
-
-/**
- * Wrapper around @c write_image_to_floppy_SUB().
- * This function, unlike @c write_image_to_floppy_SUB(),
- * gives the user the opportunity to retry if the write fails.
- * @see write_image_to_floppy_SUB
- */
-int write_image_to_floppy(char *device, char *datafile)
-{
-    /*@ int ************************************************************** */
-    int res = 0;
-
-    assert_string_is_neither_NULL_nor_zerolength(device);
-    assert_string_is_neither_NULL_nor_zerolength(datafile);
-
-    while ((res = write_image_to_floppy_SUB(device, datafile))) {
-        if (!ask_me_yes_or_no("Failed to write image to floppy. Retry?")) {
-            return (res);
-        }
-    }
-    return (res);
-}
-
-/* @} - end of utilityGroup */
-
 void setenv_mondo_var(void) {
 

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

@@ -1459 +1459 @@
     }
     if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
-        popup_and_OK(_("Please remove CD/floppy from drive(s)"));
+        popup_and_OK(_("Please remove CD from drive"));
     }
     mr_msg(3, "media type = %s",

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -827 +827 @@
                 (_("Your kernel appears not to support vfat filesystems. I am therefore"));
             log_to_screen
-                (_("using LILO instead of SYSLINUX as the CD/floppy's boot loader."));
+                (_("using LILO instead of SYSLINUX as the CD's boot loader."));
         }
         if (run_program_and_log_output("which mkfs.vfat", FALSE)) {

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -184 +184 @@
     p = NULL;
 
-    mr_cnf->write_boot_floppy = mr_conf_bread("mondo_write_boot_floppy");
     mr_cnf->create_mindi_cd = mr_conf_bread("mondo_create_mindi_cd");
 
@@ -543 +542 @@
     }
 
-    /* Offer to write floppy disk images to physical disks */
-    if (bkpinfo->backup_data && !g_skip_floppies) {
-        res = offer_to_write_boot_floppies_to_physical_disks(bkpinfo);
-        retval += res;
-    }
-
     /* Report result of entire operation (success? errors?) */
     if (!retval) {

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)) {

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -173 +173 @@
  * 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.")
 
 
@@ -908 +908 @@
     if (!g_restoring_live_from_cd) {
         popup_and_OK
-            (_("Please insert tape/CD/boot floppy, then hit 'OK' to continue."));
+            (_("Please insert tape/CD, then hit 'OK' to continue."));
         sleep(1);
     }
@@ -2847 +2847 @@
 
     run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
-    run_program_and_log_output("mkdir -p /mnt/floppy", FALSE);
 
     malloc_string(a);
@@ -3186 +3185 @@
             mvaddstr_and_log_it(g_currentY++,
                                 0,
-                                _("Run complete. Please remove floppy/CD/media and reboot."));
+                                _("Run complete. Please remove CD/media and reboot."));
         } else {
             run_program_and_log_output("sync", FALSE);