Changeset 1770 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Nov 6, 2007, 11:01:53 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Better output for mindi-busybox revision
• Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
• strace useful for debug
• fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
• fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
• fix typo in label-partitions-as-necessary which doesn't seem to work
• Update to busybox 1.7.2
• perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

• next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
• small optimization in mindi on keyboard handling (one single find instead of multiple)
• better interaction for USB device when launching mindi manually
• attempt to automatically guess block disk size for ramdisk
• fix typos in bkphw
• Fix the remaining problem with UUID support for swap partitions
• Updates mondoarchive man page for USB support
• Adds preliminary Hardware support to mindi (Proliant SSSTK)
• Tries to add udev support also for rhel4
• Fix UUID support which was still broken.
• Be conservative in test for the start-nfs script
• Update config file for mindi-busybox for 1.7.2 migration
• Try to run around a busybox bug (1.2.2 pb on inexistant links)
• Add build content for mindi-busybox in pb
• Remove distributions content for mindi-busybox
• Fix a warning on inexistant raidtab
• Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
• Create MONDO_CACHE and use it everywhere + creation at start
• Really never try to eject a USB device
• Fix a issue with &> usage (replaced with 1> and 2>)
• Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
• tty modes correct to avoid sh error messages
• Use ext3 normally and not ext2 instead
• USB device should be corrected after reading (take 1st part)
• Adds a mount_USB_here function derived from mount_CDROM_here
• usb detection place before /dev detection in device name at restore time
• Fix when restoring from USB: media is asked in interactive mode
• Adds USB support for mondorestore
• mount_cdrom => mount_media
• elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
• untar-and-softlink => untar (+ interface change)
• suppress useless softlinks creation/removal in boot process
• avoids udevd messages on groups
• Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
• skip existing big file creation
• seems to work correctly for USB mindi boot
• Adds group and tty link to udev conf
• Always load usb-torage (even 2.6) to initiate USB bus discovery
• Better printing of messages
• Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
• Links were not correctly done as non relative for modules in mindi
• exclusion of modules denied now works
• Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
• Fix bugs for DENY_MODS handling
• Add device /dev/console for udev
• ide-generic should now really be excluded
• Fix a bug in major number for tty
• If udev then adds modprobe/insmod to rootfs
• tty0 is also cretaed with udev
• ide-generic put rather in DENY_MODS
• udevd remove from deplist s handled in mindi directly
• better default for mindi when using --usb
• Handles dynamically linked busybox (in case we want to use it soon ;-)
• Adds fixed devices to create for udev
• ide-generic should not be part of the initrd when using libata v2
• support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
• Improvement in udev support (do not use cl options not available in busybox)
• Udev in mindi
  • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
  • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
  • add support for 64 bits udev
• Try to render MyInsmod silent at boot time
• Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
• We also need vaft format support for USB boot
• Adds libusual support (Ubuntu 7.10 needs it for USB)
• Improve Ubuntu/Debian keyboard detection and support
• pbinit adapted to new pb (0.8.10). Filtering of docs done in it
• Suppress some mondo warnings and errors on USB again
• Tries to fix lack of files in deb mindi package
• Verify should now work for USB devices
• More log/mesages improvement for USB support
• - Supress g_erase_tmpdir_and_scratchdir
• Improve some log messages for USB support
• Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
• Improve mindi-busybox build
• In conformity with pb 0.8.9
• Add support for Ubuntu 7.10 in build process
• Add USB Key button to Menu UI (CD streamer removed)
• Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
• Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
• Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
• Put mondorescue in conformity with new pb filtering rules
• Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
• Unmounting USB device before removal of temporary scratchdir
• Stil refining USB copy back to mondo (one command was not executed)
• No need to have the image subdor in the csratchdir when USB.
• umount the USB partition before attempting to use it
• Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive.c (modified) (12 diffs)
• libmondo-devices.c (modified) (12 diffs)
• libmondo-filelist.c (modified) (2 diffs)
• libmondo-tools.c (modified) (6 diffs)
• libmondo-verify-EXT.h (modified) (1 diff)
• libmondo-verify.c (modified) (3 diffs)
• libmondo-verify.h (modified) (1 diff)
• newt-specific.c (modified) (5 diffs)

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

@@ -929 +929 @@
                     bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
-                fatal_error("Unable to create temporary duff tarball");
+                fatal_error("Unable to create temporary all tarball");
             }
             mr_free(command);
@@ -936 +936 @@
 /* BERLIOS: Not executed ?
         sprintf(command, "cp -f %s/mindi-*oot*.img %s/images",
+*/
+        /* For USB we already have everything on the key */
+        if (bkpinfo->backup_media_type == usb) {
+            mr_asprintf(&command, "rm -rf %s/images", bkpinfo->scratchdir);
+            run_program_and_log_output(command, FALSE);
+            mr_free(command);
+        } else {
+            mr_asprintf(&command, "cp -f %s/mindi-*oot*.img %s/images",
                 bkpinfo->tmpdir, bkpinfo->scratchdir);
-*/
-        mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
+            if (system(command)) {
+                mr_msg(2, "Unable to copy mindi images");
+            }
+            mr_free(command);
+
+            mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
                  bkpinfo->scratchdir, bkpinfo->tmpdir);
-        if (system(tmp)) {
-            fatal_error("Cannot find all.tar.gz in tmpdir");
-        }
-        mr_free(tmp);
+            if (system(tmp)) {
+                fatal_error("Cannot find all.tar.gz in tmpdir");
+            mr_free(tmp);
+            }
+        }
 
         if (res) {
@@ -1162 +1175 @@
                         "Writing any remaining data to media         ");
 
-    mr_msg(1, "Closing tape/CD ... ");
+    mr_msg(1, "Closing tape/CD/USB ... ");
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         /* write tape/cdstream */
@@ -1249 +1262 @@
         write_data_disks_to_stream(data_disks_file);
     } else {
-        mr_msg(1, "Backing up to CD's");
+        if (bkpinfo->backup_media_type == usb) {
+            mr_msg(1, "Backing up to USB's");
+        } else {
+            mr_msg(1, "Backing up to CD's");
+        }
     }
     mr_free(data_disks_file);
@@ -1574 +1591 @@
     log_msg(1, message_to_screen);
 
-    if (is_this_device_mounted(bkpinfo->media_device)) {
+    asprintf(&tmp1, "%s1", bkpinfo->media_device);
+    if (is_this_device_mounted(tmp1)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
-        asprintf(&tmp, "umount %s", bkpinfo->media_device);
+        asprintf(&tmp, "umount %s", tmp1);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
     }
+    paranoid_free(tmp);
+
     log_msg(1, "Mounting USB device.");
     asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
@@ -1596 +1616 @@
 
         /* Command to execute */
-        asprintf(&tmp,"mv %s/.??* %s/* %s", bkpinfo->scratchdir, bkpinfo->scratchdir, tmp1); 
+        asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1); 
         res = eval_call_to_make_USB(tmp, message_to_screen);
         if (res) {
@@ -3262 +3282 @@
                  media_descriptor_string(g_backup_media_type));
             chdir("/");
-            iamhere("Before calling verify_cd_image()");
-            res += verify_cd_image();
-            iamhere("After calling verify_cd_image()");
+            iamhere("Before calling verification of image()");
+            if (bkpinfo->backup_media_type == usb) {
+                res += verify_usb_image();
+            } else {
+                res += verify_cd_image();
+            }
+            iamhere("After calling verification of image()");
         }
         if (!res) {
@@ -3299 +3323 @@
 
     if (last_cd) {
-        mr_msg(2, "This was your last CD.");
+        mr_msg(2, "This was your last media.");
     } else {
         mr_msg(2, "Continuing to backup your data...");
@@ -3340 +3364 @@
         mr_msg(2,
                 "Not verifying again. Per-CD/ISO verification already carried out.");
-        sprintf(tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MINDI_CACHE);
+        sprintf(tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MONDO_CACHE);
         paranoid_system(tmp);
     } else {
@@ -3369 +3393 @@
         mr_asprintf(&tmp,
                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
-                MONDO_LOGFILE, MINDI_CACHE);
+                MONDO_LOGFILE, MONDO_CACHE);
         system(tmp);
         mr_free(tmp);
@@ -3375 +3399 @@
         mr_asprintf(&tmp,
                 "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
-                MONDO_LOGFILE, MINDI_CACHE);
+                MONDO_LOGFILE, MONDO_CACHE);
         system(tmp);
         mr_free(tmp);
@@ -3382 +3406 @@
         eject_device(bkpinfo->media_device);
     }
-    sprintf(tmp, "%s/changed.files", MINDI_CACHE);
+    sprintf(tmp, "%s/changed.files", MONDO_CACHE);
     diffs = count_lines_in_file(tmp);
 

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

@@ -45 +45 @@
 
 extern bool g_ISO_restore_mode;
-extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_selfmounted_isodir;
 extern char *MONDO_LOGFILE;
@@ -555 +554 @@
 }
 
-
-/**
- * Locate a CD-R/W writer's SCSI node.
- * @param cdrw_device SCSI node will be placed here.
- * @return 0 for success, nonzero for failure.
- */
 
 
@@ -1315 +1308 @@
 
 /**
+ * Mount the CD-ROM at @p mountpoint.
+ * @param device The device (or file if g_ISO_restore_mode) to mount.
+ * @param mountpoint The place to mount it.
+ * @return 0 for success, nonzero for failure.
+ */
+int mount_USB_here(char *device, char *mountpoint)
+{
+    /*@ buffer ****************************************************** */
+    char *command;
+    char *dev;
+    int retval;
+
+    malloc_string(command);
+    malloc_string(dev);
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+
+    make_hole_for_dir(mountpoint);
+    if (isdigit(device[0])) {
+        return(1);
+    } else {
+        strcpy(dev, device);
+    }
+    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device,
+            mountpoint);
+
+#ifdef __FreeBSD__
+    sprintf(command, "mount_vfat %s %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
+
+#else
+    sprintf(command, "mount %s -t vfat %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
+#endif
+
+    log_msg(4, command);
+    retval = system(command);
+    log_msg(1, "system(%s) returned %d", command, retval);
+
+    paranoid_free(command);
+    paranoid_free(dev);
+    return (retval);
+}
+
+/**
+ * Mount the CD-ROM at @p mountpoint.
+ * @param device The device (or file if g_ISO_restore_mode) to mount.
+ * @param mountpoint The place to mount it.
+ * @return 0 for success, nonzero for failure.
+ */
+int mount_CDROM_here(char *device, char *mountpoint)
+{
+    /*@ buffer ****************************************************** */
+    char *command;
+    char *dev;
+    char *options;
+    int retval;
+
+    malloc_string(command);
+    malloc_string(dev);
+    malloc_string(options);
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+
+    make_hole_for_dir(mountpoint);
+    strcpy(options, "ro");
+    if (isdigit(device[0])) {
+        find_cdrom_device(device, FALSE);
+    } else {
+        strcpy(dev, device);
+    }
+    if (g_ISO_restore_mode) {
+
+#ifdef __FreeBSD__
+        strcpy(dev, make_vn(device));
+        if (!dev) {
+            sprintf(command, "Unable to mount ISO (make_vn(%s) failed)",
+                    device);
+            fatal_error(command);
+        }
+        strcpy(device, dev);
+#else
+        strcat(options, ",loop");
+#endif
+
+    }
+    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
+            mountpoint);
+    /*@ end vars *************************************************** */
+
+#ifdef __FreeBSD__
+    sprintf(command, "mount_cd9660 -r %s %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
+
+#else
+    sprintf(command, "mount %s -o %s -t iso9660 %s 2>> %s",
+            device, options, mountpoint, MONDO_LOGFILE);
+#endif
+
+    log_msg(4, command);
+    if (strncmp(device, "/dev/", 5) == 0) {
+        retract_CD_tray_and_defeat_autorun();
+    }
+    retval = system(command);
+    log_msg(1, "system(%s) returned %d", command, retval);
+
+    paranoid_free(command);
+    paranoid_free(dev);
+    paranoid_free(options);
+    return (retval);
+}
+
+
+
+
+
+
+/**
  * Ask the user for CD number @p cd_number_i_want.
  * Sets g_current_media_number once the correct CD is inserted.
@@ -1443 +1554 @@
 {
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *sz_size = NULL;
     char *command = NULL;
@@ -1480 +1592 @@
     case dvd:
     case usb:
+        /* Never try to eject a USB device */
+        if (bkpinfo->backup_media_type == usb) {
+            bkpinfo->please_dont_eject = TRUE;
+        }
         if (archiving_to_media) {
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
@@ -1556 +1672 @@
             }
         }
-
+        /* No break because we continue even for usb */
     case cdstream:
-        if (bkpinfo->disaster_recovery) {
+        if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
             mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
             mr_msg(2, "CD-ROM device assumed to be at %s", bkpinfo->media_device);
-        } else if (bkpinfo->restore_data || bkpinfo->backup_media_type == dvd) {
+        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb))
+                   || bkpinfo->backup_media_type == dvd) {
             if (!bkpinfo->media_device) {
                 mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
@@ -1582 +1699 @@
                     bkpinfo->media_device);
         } else {
+<<<<<<< .courant
             mr_asprintf(&comment, _("What is your media device ?"));
             mr_asprintf(&tmp, mr_conf->media_device);
@@ -1588 +1706 @@
                 log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
-            }
+=======
+            if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
+                bkpinfo->media_device[0] = '\0';
+>>>>>>> .fusion-droit.r1769
+            }
+<<<<<<< .courant
             mr_free(comment);
 
@@ -1602 +1725 @@
                 if (!popup_and_get_string("Device", comment, tmp, 5)) {
                     log_to_screen(_("User has chosen not to backup the PC"));
+=======
+            if (bkpinfo->media_device[0]) {
+                if (bkpinfo->backup_media_type == usb) {
+                    sprintf(tmp,
+                        "I think your %s media corresponds to %s. Is this correct?",
+                        media_descriptor_string(bkpinfo->backup_media_type),
+                        bkpinfo->media_device);
+                } else {
+                    sprintf(tmp,
+                        "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)",
+                        media_descriptor_string(bkpinfo->backup_media_type),
+                        bkpinfo->media_device);
+                }
+                if (!ask_me_yes_or_no(tmp)) {
+                    bkpinfo->media_device[0] = '\0';
+                }
+            }
+            if (!bkpinfo->media_device[0]) {
+                if (bkpinfo->backup_media_type == usb) {
+                    i = popup_and_get_string("/dev entry?",
+                                         "What is the /dev entry of your USB Disk/Key, please?",
+                                         bkpinfo->media_device,
+                                         MAX_STR_LEN / 4);
+                } else {
+                    if (g_kernel_version < 2.6) {
+                        i = popup_and_get_string("Device node?",
+                                             "What is the SCSI node of your CD (re)writer, please?",
+                                             bkpinfo->media_device,
+                                             MAX_STR_LEN / 4);
+                    } else {
+                        i = popup_and_get_string("/dev entry?",
+                                             "What is the /dev entry of your CD (re)writer, please?",
+                                             bkpinfo->media_device,
+                                             MAX_STR_LEN / 4);
+                    }
+                }
+                if (!i) {
+                    log_to_screen("User has chosen not to backup the PC");
+>>>>>>> .fusion-droit.r1769
                     finish(1);
                 }
@@ -1770 +1932 @@
         // check whether writable - we better remove surrounding spaces for this
         mr_strip_spaces(bkpinfo->nfs_remote_dir);
-        mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
-                bkpinfo->nfs_remote_dir);
+        mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
+        mr_asprintf(&command, "echo hi > '%s'", tmp1);
         while (run_program_and_log_output(command, FALSE)) {
             mr_asprintf(&tmp, bkpinfo->nfs_remote_dir);
@@ -1788 +1950 @@
             // check whether writable - we better remove surrounding space s for this
             mr_strip_spaces(bkpinfo->nfs_remote_dir);
+            paranoid_free(tmp1);
+            mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
 
             mr_free(command);
-            mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
-                    bkpinfo->nfs_remote_dir);
+            mr_asprintf(&command, "echo hi > '%s'", tmp1);
         }
         mr_free(command);
+        unlink(tmp1);
+        paranoid_free(tmp1);
 
         mr_asprintf(&tmp, mr_conf->prefix);
@@ -2183 +2348 @@
     mr_asprintf(&mountdev, bkpinfo->media_device);
     if (!is_this_device_mounted(MNT_CDROM)) {
-        mount_CDROM_here(mountdev, MNT_CDROM);
+        if (bkpinfo->backup_media_type == usb) {
+            mount_USB_here(mountdev, MNT_CDROM);
+        } else {
+            mount_CDROM_here(mountdev, MNT_CDROM);
+        }
     }
     cd_number =

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

@@ -1515 +1515 @@
                        char *userdef_filelist)
 {
-    char sz_datefile_wildcard[] = "/var/cache/mondo-archive/difflevel.%d";
+    char sz_datefile_wildcard[] = MONDO_CACHE"/difflevel.%d";
     char *p = NULL;
     char *q = NULL;
@@ -1589 +1589 @@
         mr_msg(2, "include_paths = '%s'", include_paths);
         mr_msg(1, "Calculating filelist");
-        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s . .. \
+        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s %s . .. \
 " MNT_CDROM " /mnt/floppy /media \
 /proc /sys /tmp /var/log/lastlog /root/images/mondo " MINDI_CACHE " " MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);

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

@@ -32 +32 @@
 
 extern int g_tape_buffer_size_MB;
-extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_serial_string;
 extern bool g_text_mode;
@@ -653 +652 @@
     }
 
-    asprintf(&tmp,"rm -Rf %s/changed.files*",MINDI_CACHE);
+    asprintf(&tmp,"rm -Rf %s/changed.files*",MONDO_CACHE);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -798 +797 @@
     assert_string_is_neither_NULL_nor_zerolength(partition);
 
-    mr_asprintf(&command, "df -m -P %s &> /dev/null", partition);
+    mr_asprintf(&command, "df -m -P %s 1> /dev/null 2> /dev/null", partition);
     if (system(command)) {
         return (-1);
@@ -838 +837 @@
     /*@ int's *************** */
     int retval = 0;
-    long Lres;
-
 
     mvaddstr_and_log_it(g_currentY, 0,
                         "Checking sanity of your Linux distribution");
 #ifndef __FreeBSD__
-    if (system("which mkfs.vfat &> /dev/null")
-        && !system("which mkfs.msdos &> /dev/null")) {
+    if (system("which mkfs.vfat 2> /dev/null 1> /dev/null")
+        && !system("which mkfs.msdos 2> /dev/null 1> /dev/null")) {
         log_it
             ("OK, you've got mkfs.msdos but not mkfs.vfat; time for the fairy to wave her magic wand...");
@@ -1225 +1222 @@
         malloc_string(g_boot_mountpt);
         malloc_string(g_tmpfs_mountpt);
-        malloc_string(g_erase_tmpdir_and_scratchdir);
         malloc_string(g_serial_string);
         malloc_string(g_magicdev_command);
@@ -1231 +1227 @@
         mr_free(g_boot_mountpt);
         mr_free(g_tmpfs_mountpt);
-        mr_free(g_erase_tmpdir_and_scratchdir);
         mr_free(g_serial_string);
         mr_free(g_magicdev_command);

branches/stable/mondo/src/common/libmondo-verify-EXT.h

@@ -3 +3 @@
 
 extern int verify_cd_image();
+extern int verify_usb_image();
 extern int verify_a_tarball(char *);
 extern int verify_an_afioball_from_CD(char *);

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

@@ -879 +879 @@
 
 /**
+ * Verify the USB device
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->isodir
+ * - @c bkpinfo->media_device
+ * - @c bkpinfo->tmpdir
+ * - @c bkpinfo->verify_data
+ *
+ * @return 0 for success (even if differences are found), nonzero for failure.
+ * @ingroup verifyGroup
+ */
+int verify_usb_image()
+{
+
+    /*@ int ************************************************************ */
+    int retval = 0;
+
+    /*@ buffers ******************************************************** */
+    char *mountpoint = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *fname = NULL;
+    int ret = 0;
+#ifdef __FreeBSD__
+    char mdd[32];
+    char *mddevice = mdd;
+    int vndev = 2;
+#else
+//skip
+#endif
+
+    assert(bkpinfo != NULL);
+
+    asprintf(&fname, "%s1", bkpinfo->media_device);
+    if (is_this_device_mounted(fname)) {
+        log_msg(1, "USB device mounted. Remounting it at the right place");
+        asprintf(&tmp, "umount %s", fname);
+        run_program_and_log_output(tmp, FALSE);
+        paranoid_free(tmp);
+    }
+    paranoid_free(fname);
+
+    log_msg(1, "Mounting USB device.");
+    asprintf(&mountpoint, "%s/usb", bkpinfo->tmpdir);
+    asprintf(&tmp, "mkdir -p %s", mountpoint);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
+    /* Mindi always create one single parition on the USB dev */
+    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, mountpoint);
+    ret = run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
+    if (ret) {
+        paranoid_free(mountpoint);
+        return(ret);
+    }
+
+    sync();
+    log_msg(2, "OK, I've mounted the USB Disk/Key\n");
+    asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    if (!does_file_exist(tmp)) {
+        log_msg
+            (2,
+             "This is the last USB device. I am therefore setting bkpinfo->verify_data to FALSE.");
+        bkpinfo->verify_data = FALSE;
+/*
+   (a) It's an easy way to tell the calling subroutine that we've finished &
+   there are no more device to be verified; (b) It stops the post-backup verifier
+   from running after the per-device verifier has run too.
+*/
+    }
+    paranoid_free(tmp);
+    verify_afioballs_on_CD(mountpoint);
+    iamhere("before verify_all_slices");
+    verify_all_slices_on_CD(mountpoint);
+
+    asprintf(&tmp1, "umount %s", mountpoint);
+#ifdef __FreeBSD__
+    ret += system(tmp1);
+    ret += kick_vn(mddevice);
+    if (ret)
+#else
+    if (system(tmp1))
+#endif
+    {
+        asprintf(&tmp, "%s failed; unable to unmount USB device\n", tmp1);
+        log_to_screen(tmp);
+        paranoid_free(tmp);
+        retval++;
+    } else {
+        log_msg(2, "OK, I've unmounted the USB device\n");
+    }
+    paranoid_free(tmp1);
+    paranoid_free(mountpoint);
+    return (retval);
+}
+
+
+/**
  * Verify the CD indicated by @c g_current_media_number.
  * @param bkpinfo The backup information structure. Fields used:
@@ -1084 +1181 @@
     diffs = count_lines_in_file(changed_files_fname);
     if (diffs > 0) {
-        mr_asprintf(&tmp, "cp -f %s %s/changed.files", changed_files_fname, MINDI_CACHE);
+        mr_asprintf(&tmp, "cp -f %s %s/changed.files", changed_files_fname, MONDO_CACHE);
         run_program_and_log_output(tmp, FALSE);
         mr_free(tmp);
@@ -1090 +1187 @@
         mr_asprintf(&tmp,
                  "%ld files differed from live filesystem; type less %s or less %s/changed.files to see",
-                 diffs, changed_files_fname, MINDI_CACHE);
+                 diffs, changed_files_fname, MONDO_CACHE);
         mr_msg(0, tmp);
         mr_free(tmp);
 
         log_to_screen
-            (_("See "MINDI_CACHE"/changed.files for a list of nonmatching files."));
+            (_("See "MONDO_CACHE"/changed.files for a list of nonmatching files."));
         log_to_screen
             (_("The files probably changed on filesystem, not on backup media."));
-        //      retval++;
     }
     mr_free(changed_files_fname);

branches/stable/mondo/src/common/libmondo-verify.h

@@ -63 +63 @@
 
 int verify_cd_image();
+int verify_usb_image();
 int verify_a_tarball(char *);
 int verify_an_afioball_from_CD(char *);

branches/stable/mondo/src/common/newt-specific.c

@@ -105 +105 @@
      g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
 bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
-char *g_erase_tmpdir_and_scratchdir = NULL; ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
 char *g_selfmounted_isodir = NULL;  ///< Holds the NFS mountpoint if mounted via mondoarchive.
 
@@ -326 +325 @@
     }
 
-    if (g_erase_tmpdir_and_scratchdir[0]) {
-        run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
-    }
-
     if (g_selfmounted_isodir) {
         mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
@@ -373 +368 @@
     run_program_and_log_output("rm -Rf /mondo.scratch.* /tmp.mondo.*",
                                    FALSE);
-    if (g_erase_tmpdir_and_scratchdir) {
-        run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
-    }
     if (g_selfmounted_isodir) {
         mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
@@ -396 +388 @@
     printf("Execution run ended; result=%d\n", signal_code);
     printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
+    mr_asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+    system(command);
+    paranoid_free(command);
+    paranoid_free(bkpinfo);
     free_libmondo_global_strings();
     mr_exit(signal_code, "Execution run ended");
@@ -1190 +1186 @@
     b2 = newtButton(17, 1, _("CD-RW disks"));
     b3 = newtButton(1, 9, _("Tape drive "));
-    b4 = newtButton(17, 5, _("CD streamer"));
+    b4 = newtButton(17, 5, _("USB Key/Disk"));
     b5 = newtButton(1, 5, _(" DVD disks "));
     b6 = newtButton(17, 9, _(" NFS mount "));