Changeset 3753 in MondoRescue for branches/3.3/mondo

Timestamp:

Nov 30, 2019, 1:45:07 AM (4 years ago)

Author:

Bruno Cornec

Message:

Remove floppy support

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (3 diffs)
• include/my-stuff.h (modified) (1 diff)
• mondo.dox (modified) (2 diffs)
• mondoarchive/mondoarchive.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/3.3/mondo/src/common/libmondo-filelist.c

@@ -1567 +1567 @@
         mr_free(tmp1);
 
-        mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/selinux|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|/media|/tmp|/selinux|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
         if (excp != NULL) {
             mr_strcat(exclude_paths,"|%s",excp);

branches/3.3/mondo/src/common/libmondo-tools.c

@@ -44 +44 @@
  */
 bool g_remount_cdrom_at_end,    ///< TRUE if we unmounted the CD-ROM and should remount it when done with the backup.
- g_remount_floppy_at_end;       ///< TRUE if we unmounted the floppy and should remount it when done with the backup.
 bool g_cd_recovery = FALSE;             ///< TRUE if we're making an "autonuke" backup.
 double g_kernel_version;
@@ -1100 +1099 @@
         run_program_and_log_output("mount " MNT_CDROM, FALSE);
     }
-    if (g_remount_floppy_at_end) {
-        run_program_and_log_output("mount " MNT_FLOPPY, FALSE);
-    }
 }
 
@@ -1114 +1110 @@
         g_remount_cdrom_at_end = TRUE;
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    }
-    if (run_program_and_log_output
-        ("mount | grep floppy | grep super", FALSE) == 0) {
-        g_remount_floppy_at_end = TRUE;
-        run_program_and_log_output("umount " MNT_FLOPPY, FALSE);
     }
 }

branches/3.3/mondo/src/include/my-stuff.h

@@ -369 +369 @@
 
 #define MNT_CDROM "/mnt/cdrom"
-#define MNT_FLOPPY "/mnt/floppy"
 
 #define DEFAULT_MR_LOGLEVEL 4

branches/3.3/mondo/src/mondo.dox

@@ -177 +177 @@
  * @defgroup verifyGroup Verification Functions
  * Functions for verifying data while booted from the hard drive (as opposed
- * to a "compare", which is done while booted from CD/floppy).
+ * to a "compare", which is done while booted from CD/Tape).
  */
 /**
@@ -186 +186 @@
 /**
  * @defgroup compareGroup Compare Functions
- * Functions for comparing data while booted from CD/floppy (as opposed
+ * Functions for comparing data while booted from CD/Tape (as opposed
  * to a "verify", which is done while booted from the hard drive).
  */

branches/3.3/mondo/src/mondoarchive/mondoarchive.c

@@ -27 +27 @@
 extern bool g_text_mode;
 extern char *g_boot_mountpt;
-extern bool g_remount_floppy_at_end;
 extern char *g_cdrw_drive_is_here;
 static char *g_cdrom_drive_is_here = NULL;

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

@@ -2092 +2092 @@
 
 /**
- * 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