Changeset 3753 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

Remove floppy support

Location:

branches/3.3

Files:

• contrib/backup-kungfu/backup-kungfu (modified) (1 diff)
• mindi/INSTALL (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mindi/rootfs/etc/fstab (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (3 diffs)
• mondo/src/include/my-stuff.h (modified) (1 diff)
• mondo/src/mondo.dox (modified) (2 diffs)
• mondo/src/mondoarchive/mondoarchive.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• tools/myval (modified) (1 diff)

branches/3.3/contrib/backup-kungfu/backup-kungfu

@@ -104 +104 @@
     # rm -rf ${backup_dir}/${comp_name}*
     
-    # Create the new folder and move all the iso and floppy images to it
+    # Create the new folder and move all the iso images to it
     echo -e "Creating the new backup directory and moving the files there...\n"
     mkdir -p ${backup_dir}/${comp_name}_${date}/images

branches/3.3/mindi/INSTALL

@@ -19 +19 @@
 - locate your kernel and modules
 - put together a package of all the tools you are likely to need
-- generate some floppy disk images
+- generate some boot disk images
 - offer to write the images to disks for you
 

branches/3.3/mindi/mindi

@@ -69 +69 @@
 
 # ide-probe-mod
-IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs edd paride ata_generic ata_piix dock via82cxxx generic nvidia ahci sata_nv cmd64x pata_via pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp pata_acpi amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw virtio virtio_blk virtio_pci hv_storvsc raid0 raid1 raid456 drbd"
+IDE_MODS="ide ide-floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs edd paride ata_generic ata_piix dock via82cxxx generic nvidia ahci sata_nv cmd64x pata_via pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp pata_acpi amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw virtio virtio_blk virtio_pci hv_storvsc raid0 raid1 raid456 drbd"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 USB_MODS="usb-storage usb_storage usb-ohci usb-uhci input hid hid_generic hid-generic hid_microsoft hid-microsoft uhci_hcd uhci-hcd ehci-hcd ehci-pci ohci-hcd ohci_hcd ohci-pci xhci xhci-hcd xhci-pci usbkbd usbhid keybdev mousedev scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial cdc_eem"

branches/3.3/mindi/rootfs/etc/fstab

@@ -4 +4 @@
 #/dev/cdrom /mnt/cdrom iso9660 noauto,owner,ro,exec 0 0
 /dev/cdrom /mnt/cdrom iso9660 noauto 0 0
-/dev/fd0 /mnt/floppy ext2 owner,rw,exec 0 0
+#/dev/fd0 /mnt/floppy ext2 owner,rw,exec 0 0

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

branches/3.3/tools/myval

@@ -3 +3 @@
 # Call valgrind to test mondo
 
-sudo valgrind --log-file=/tmp/val.log --show-reachable=yes --leak-check=full /bruno/pb/projects/mondorescue/build/BUILD/mondo-3.0/src/mondoarchive/mondoarchive -K 99 -Oi -I /etc -d /home
-sudo valgrind --log-file=/tmp/valg.log --show-reachable=yes --leak-check=full /bruno/pb/projects/mondorescue/build/BUILD/mondo-3.0/src/mondoarchive/mondoarchive -g -K 99 -Oi -I /etc -d /home
+m=`ls -tr /users/bruno/pb/projects/mondorescue/pbbuild/BUILD/ | grep mondo-3.3 | tail -1`
+sudo valgrind --log-file=/tmp/val.log --show-reachable=yes --leak-check=full /users/bruno/pb/projects/mondorescue/pbbuild/BUILD/$m/src/mondoarchive/mondoarchive -K 99 -Oi -I /etc -d /home
+sudo valgrind --log-file=/tmp/valg.log --show-reachable=yes --leak-check=full /users/bruno/pb/projects/mondorescue/pbbuild/BUILD/$m/src/mondoarchive/mondoarchive -g -K 99 -Oi -I /etc -d /home