Changeset 2937 in MondoRescue for branches/3.1/mondo/src/common

Timestamp:

Jan 28, 2012, 1:51:28 AM (13 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2849:2935 ../3.0

• Adds 3 binaries called potentially by udev o support USB key mount at restore time (Victor Gattegno)
• mindi only sets the boot flag of a USB device if none is present already (should avoid flip/flop situation)
• Fix a compatibility bug in analyze-my-lvm whete exclude lists with '|' was incorrectly analyzed (' ' still expected)
• Precise that -J is not supported by mondorestore yet.
• Fix a compatibility bug in mindi where exclude lists with '|' was incorrectly analyzed (' ' still expected)
• Install an MBR on USB devices when possible
• Improve error message in case mondorestore isn't found
• Adds support for more virtio devices for KVM restore
• Improve mbr.bin handling
• Fix an issue in test of FindKernel for Xen and non Xen cases
  • Fix #492 by removing an extra useless fi
  • Move fvat nd fat modules to CDROM_MODS in order to have them in the initrd to support saving logs to a USB device e.g.
  • Fix an error when dmidecode reports comments before system name
  • Fix previous broken patch on comment management for bkphw
  • Improve msgs printed during kbd analysis
  • Fix a small remaining pb with new comment support
  • Try to again improve the mount/umount stuff in mondo -Adds mention to OEL, CentOS, ScientifLinux as RHEL clones
• Fix a panadoid_free done on the wrong variable (solve a memory leak)
• Solve #495 by skipping the potential (auto-read-only) when analyzin /proc/mdstat result
• Fix some markup in man pages
• adds the post-nuke script sample for Debian (Guillaume Pernot/Andrée Leidenfrost)
• Avoid a useless umount when changing of afio set, let insist_on_cd check and perform if needed
• Copy everything under .ssh of root account to allow for sshfs mount without passwd at restore time.
• Adds support for bnx2i driver
• Try to fix #496 by supporting the protocol in the output of the mount command (sshfs#...)
• Uses the -d option of the mount command to avoid leaving loop devices in use. Probably provoked by the usage of a more recent busybox, but anyway that option doesn't hurt, and does nothing for non-loop devices. Should fix the problems reported on the ML with NFS and more than 8 ISO images (8 being the default number of loop devices available)
• Attempt to fix #436 by adding some newtDrawForm where appropriate.
• Fix bugs in the kernel detection routine of mindi (some echo were done without capturing their output, confusing the return). This should also help the Xen detection issue
• Change the logging function to be nearer from 2.2.10, and start using some
• Initialize some global fields with an empty string, now that newt Draws more regularly progress forms
• Mindi progression still not good, but showing now 3% when calling mindi. Would need a specific handling for the progress bar to evolve more afterwards
• Add compatibility with the latest SSSTK + PSP content for HP ProLiant + branding homogeneous now. We only take conrep out of the SSSTK pending a package availability. Using hpacuscripting now. Review of parameters called following test made.
• Fix #501 by pushing BOOT_SIZE to 36864 for certain Ubuntu cases
• Fix some remaining inconsistencis in the ProLiant HW backup. ready for usage.
• Fix an issue on udevadm call (needs an intermediate variable)
• Fix a remaining ProLiant tool call
• Remove again some wrong variable initialization for Net in order to not have strange messages now we call Draw more often
• Adds support for hwaddr (MAC addresses) at restore time, and map to the correct NIC if it's found at restore time (based on code from Stefan Heijmans)
• Try to Fix #499 by changing init in order to never exit, and rebooting using sysrq in /proc (not portable). Maybe should move to using a real init, and a separated rcS script.
• Fixes the shell msg error by using setsid as per Busybox FAQ
• Fix #491 by correctly checking Xen kernel used for a dom0 env (apollo13)
• Improves logging in Die()
• Improve again ProLiant HW support, by adding references to the yet to come SSSTK rpm so that conrep is called at its future right place.
• Improve mindi support for kernel 3.x
• Fix #499 for good, by using a real init from busybox and moving our init script to etc/init.d/rcS. We also now call the reboot from busybox to exit, which indeed reset the system correctly (in a VM at least which wasn't the case before). Reauires a new mindi-busybox as well.
• Attempt to solve #503 by handling /lib64 separately for udev and only if not a link (to /lib) for Ubuntu 64
• Improve again previous tests for bug #503
• Improve -d option description for NFS
• Allow http download for ftp content
• New italian mirror
• Fix #505 by documenting environment variables
  • Fix a bug where on OBDR mode compression was turned off to create the OBDR content but not back on (report from the mailing list)
• solve http://trac.mondorescue.org/ticket/520 by Victor Gattegno
• Fix #524 as option -U needs a size also
• Removes useless gendf option
• Fix #511 now stabgrub is called also after conf file modifications
• Adds support for SUID binaries
• remove a useless xenkernelname variable from mindi
• Should fix #512 by clearing old scratchdir before changing to a new
• Simplify the function engaging SCSI for Smart Array controllers, and support as many controller as we have
• Add some binaries used on SLES 10 by udev
• Fix a syntax issue in newt-specific.c
• Fix a memory free bug where a used variable was freed to early
• Fix a memory free bug where a used variable was misused in asprintf/free
• Fix #498 by using an external program (hpsa_obdr_mode) which can set the mode of the tape to CD-ROM or Sequential at will.

That program will have to be downloaded from ​http://cciss.sf.net

• Adds support for the route command in mindi-busybox
• Force block size back to 32768 in OBDR mode after skipping the 2 tape marks, to read the additional rootfs data corerctly - Fix #498 for good it seems
• Adds support for a new pata_atiixp driver
• Fix #525 and improve printing when no /etc/raidtab, but still md devices
• Exclude /run similarly to /sys and /proc
• Fix a bug in mindi when having multiple swap partiions with same starting string (/dev/dm-1 and /dev/dm-16). We now add a space in the grep to avoid mischoice.
• Fix grub installation if we had to go in the hack part which wasn't using the correct variables to make decisions !
• Remove all mention of mondorescue.com from code
• Fix some website typo on the download page and precise that we now develop on Mageia
• Exclude sysfs devpts and tmpfs partitions found in RHEL 6.2 from analyze by mindi (made error messages)
• Force activation of first partition which should not be optional as everything is destroyed before
• Fix a bug in analyze-my-lvm where LVs were created in random order (the one of lvscan) instead of using the dm-xxx order, which creates issues at restore time between the mapping created then and the one we had at backup time which could be inconssistent

-mondoarchive now exists if the mt command is missing when needed

• Proper fix for analyze-my-lvm
• Fix #500 and #473 by adding support of old metadata format for mdadm if using grub < 0.9x or lilo on a md boot device (to be tested)
• Really never inject or eject when the -e option is passed or device is inappropriate (USB, Net, ...)
• Fix #577 by having factor back as a float (not a long ! it's a decimal value) and making the appropriate cast.
• Fix #578 by improving the regexp used for CD/DVD detection with -scanbus option
• Adds more verbosity when LVM creation fails.
• Fix #579 by checking with pipes on both sides of the string
• debugfs should be excluded from the device considered for fstab analysis

Location:

branches/3.1/mondo/src/common

Files:

• libmondo-archive.c (modified) (10 diffs)
• libmondo-cli.c (modified) (2 diffs)
• libmondo-devices.c (modified) (9 diffs)
• libmondo-filelist.c (modified) (2 diffs)
• libmondo-files-EXT.h (modified) (1 diff)
• libmondo-files.c (modified) (5 diffs)
• libmondo-files.h (modified) (1 diff)
• libmondo-fork.c (modified) (1 diff)
• libmondo-mountlist.c (modified) (1 diff)
• libmondo-raid.c (modified) (1 diff)
• libmondo-stream.c (modified) (1 diff)
• libmondo-tools.c (modified) (2 diffs)
• libmondo-verify.c (modified) (3 diffs)
• newt-specific.c (modified) (9 diffs)

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

@@ -483 +483 @@
  * - @c compression_level
  * - @c differential
- * - @c exclude_paths
  * - @c image_devs
  * - @c kernel_path
@@ -610 +609 @@
 
     if (!bkpinfo->nonbootable_backup && (bkpinfo->boot_loader == '\0' || bkpinfo->boot_device == NULL)) {
+        update_evalcall_form(2);
 
 #ifdef __FreeBSD__
@@ -782 +782 @@
     mr_free(command);
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
+    update_evalcall_form(3);
 
     /*                          1           2  3          4    5    6    7   8    9    10 */
@@ -832 +833 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Calling MINDI to create boot+data disks");
+    open_evalcall_form("Calling MINDI to create boot+data disks");
     res = run_external_binary_with_percentage_indicator_NEW("Generating boot+data disks", command);
+    update_evalcall_form(99);
     paranoid_free(command);
 
@@ -874 +877 @@
         mr_free(tmp);
     }
+    close_evalcall_form();
     return (res);
 }
@@ -1471 +1475 @@
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_asprintf(tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
@@ -1499 +1503 @@
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
+
 
     /* Mindi always create one single parition on the USB dev */
@@ -1595 +1600 @@
     log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_asprintf(tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
@@ -2599 +2604 @@
 
     if (!ok_go_ahead_burn_it) {
-        eject_device(cdrom_dev);
+        if (!bkpinfo->please_dont_eject) {
+            eject_device(cdrom_dev);
+        }
         mds = media_descriptor_string(g_backup_media_type);
         mr_asprintf(tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", mds, g_current_media_number, mds);
@@ -3254 +3261 @@
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
 //    if (bkpinfo->backup_media_type != iso && !bkpinfo->please_dont_eject_when_restoring)
-//{
-        eject_device(bkpinfo->media_device);
-//}
+        if (!bkpinfo->please_dont_eject) {
+            eject_device(bkpinfo->media_device);
+        }
     }
     mr_asprintf(tmp, "%s/changed.files", MONDO_CACHE);

branches/3.1/mondo/src/common/libmondo-cli.c

@@ -488 +488 @@
             *p = '\0';
         }
-        mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+        mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
         mr_free(bkpinfo->isodir);
         bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp1,TRUE);
@@ -776 +776 @@
 
     if (flag_set['S']) {
+        /* Before changing remove old ones if any */
+        if (bkpinfo->scratchdir) {
+            chdir("/tmp");
+            mr_asprintf(tmp1, "rm -Rf %s", bkpinfo->scratchdir);
+            paranoid_system(tmp1);
+            mr_free(tmp1);
+        }
         mr_asprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
     }

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

@@ -94 +94 @@
 {
 //  log_it("rctada: Retracting all CD trays", __LINE__);
-    if (strlen(g_cdrom_drive_is_here) > 0) {
-        inject_device(g_cdrom_drive_is_here);
-    }
-    if (strlen(g_dvd_drive_is_here) > 0) {
-        inject_device(g_dvd_drive_is_here);
-    }
-    if (strlen(g_cdrw_drive_is_here) > 0) {
-        inject_device(g_cdrw_drive_is_here);
+    if (!bkpinfo->please_dont_eject) {
+        if (strlen(g_cdrom_drive_is_here) > 0) {
+            inject_device(g_cdrom_drive_is_here);
+        }
+        if (strlen(g_dvd_drive_is_here) > 0) {
+            inject_device(g_dvd_drive_is_here);
+        }
+        if (strlen(g_cdrw_drive_is_here) > 0) {
+            inject_device(g_cdrw_drive_is_here);
+        }
     }
 //  log_it("rctada: killing autorun");
@@ -537 +539 @@
     tmp1 = find_home_of_exe(cdr_exe);
     if (tmp1) {
-        mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1", cdr_exe);
+        mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1", cdr_exe);
         tmp = call_program_and_get_last_line_of_output(command,TRUE);
         mr_free(command);
@@ -846 +848 @@
     }
 
-    tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1",TRUE);
+    tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
         mr_free(tmp);
-        tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1",TRUE);
+        tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
     if (tmp[0]) {
         devno = atoi(tmp) - 1;
@@ -1448 +1450 @@
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
         log_msg(3, "Currently, we hold %d but we want %d", res, cd_number_i_want);
+
+        /* Now we need to umount the current media to have the next mounted after */
+        run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
+        log_msg(3, "Mounting next media %d",cd_number_i_want);
+        g_current_media_number = cd_number_i_want;
+        mount_media();
+
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         log_msg(3, "Insisting on %s #%d", mds, cd_number_i_want);
@@ -1457 +1466 @@
             if (is_this_device_mounted(MNT_CDROM)) {
                 res =
-                    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+                    run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
             } else {
                 res = 0;
@@ -1995 +2004 @@
 char *tmp = NULL;
 char *tmp1 = NULL;
+char *tmp2 = NULL;
 
 if (pathlist == NULL) {
@@ -2052 +2062 @@
         /*  Adds a | to ensure correct detection even at both ends */
         mr_asprintf(tmp1,"|%s",token);
+        mr_asprintf(&tmp2,"|%s|",token);
         if (mode == 'E') {
             /*  Add the token if not already in the list */
             mr_asprintf(tmp,"|%s|",bkpinfo->exclude_paths);
-            if (strstr(tmp,tmp1) == NULL) {
+            if (strstr(tmp,tmp2) == NULL) {
                 if (bkpinfo->exclude_paths) {
                     mr_strcat(bkpinfo->exclude_paths,tmp1);
@@ -2066 +2077 @@
             /*  Add the token if not already in the list */
             mr_asprintf(tmp,"|%s|",bkpinfo->include_paths);
-            if (strstr(tmp,tmp1) == NULL) {
+            if (strstr(tmp,tmp2) == NULL) {
                 mr_strcat(bkpinfo->include_paths, "%s", tmp1);
             }
@@ -2072 +2083 @@
         }
         mr_free(tmp);
+        mr_free(tmp2);
         break;
     }

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

@@ -1366 +1366 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o fstype devtmpfs -prune -o -fstype proc -prune -o -fstype selinuxfs -prune -o -fstype securityfs -prune -o -fstype hugetlbfs -o -fstype cgroup -prune -prune -o -fstype mqueue -prune -o -fstype debugfs -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
@@ -1582 +1582 @@
         mr_free(tmp1);
 
-        mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/dev/shm|"MINDI_CACHE, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
+        mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
         if (excp != NULL) {
             mr_strcat(exclude_paths,"|%s",excp);

branches/3.1/mondo/src/common/libmondo-files-EXT.h

@@ -45 +45 @@
 extern long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);
 
-extern int make_grub_install_scriptlet(char *outfile);
 extern int read_one_liner_data_file(char *fname, char *contents);

branches/3.1/mondo/src/common/libmondo-files.c

@@ -904 +904 @@
     if (res) {
         log_to_screen("Please install '%s'. I cannot find it on your system.", fname);
-        log_to_screen("There may be hyperlink at http://www.mondorescue.com which");
+        log_to_screen("There may be hyperlink at http://www.mondorescue.org which");
         log_to_screen("will take you to the relevant (missing) package.");
         return (1);
@@ -1063 +1063 @@
     /*@ buffers ******** */
     char *netfs_dev = NULL;
-    char *mac_addr = NULL;
+    char *netfs_client_hwaddr = NULL;
     char *netfs_mount = NULL;
     char *netfs_client_ipaddr = NULL;
@@ -1127 +1127 @@
     if (!strncmp(netfs_dev, "bond", 4) || !strncmp(netfs_dev, "alb", 3) || !strncmp(netfs_dev, "aft", 3)) {
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
-        mr_asprintf(command, "%s", "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
-        mac_addr = call_program_and_get_last_line_of_output(command,TRUE);
+
+        mr_asprintf(command, "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
+        netfs_client_hwaddr = call_program_and_get_last_line_of_output(command,TRUE);
         mr_free(command);
 
-        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,netfs_dev);
-        mr_free(mac_addr);
+        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", netfs_client_hwaddr, netfs_dev);
         mr_free(netfs_dev);
 
@@ -1151 +1151 @@
     mr_free(netfs_mount);
 
-    mr_asprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
-    mr_free(tmp);
-
     mr_asprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_ipaddr);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_hwaddr);
     mr_free(tmp);
 
@@ -1306 +1306 @@
 }
 
-
-/**
- * Create a small script that mounts /boot, calls @c grub-install, and syncs the disks.
- * @param outfile Where to put the script.
- * @return 0 for success, 1 for failure.
- */
-int make_grub_install_scriptlet(char *outfile)
-{
-    FILE *fout;
-    char *tmp = NULL;
-    int retval = 0;
-
-    if ((fout = fopen(outfile, "w"))) {
-        fprintf(fout,
-                "#!/bin/sh\n\nmount /boot > /dev/null 2> /dev/null\ngrub-install $@\nres=$?\nsync;sync;sync\nexit $res\n");
-        paranoid_fclose(fout);
-        log_msg(2, "Created %s", outfile);
-        mr_asprintf(tmp, "chmod +x %s", outfile);
-        paranoid_system(tmp);
-        mr_free(tmp);
-        retval = 0;
-    } else {
-        retval = 1;
-    }
-    return (retval);
-}
-
 /* @} - end fileGroup */

branches/3.1/mondo/src/common/libmondo-files.h

@@ -44 +44 @@
 int make_hole_for_dir(const char *outdir_fname);
 long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);
-int make_grub_install_scriptlet(char *outfile);
-
 int read_one_liner_data_file(char *fname, char *contents);

branches/3.1/mondo/src/common/libmondo-fork.c

@@ -97 +97 @@
  * - @c bkpinfo->manual_cd_tray
  * - @c bkpinfo->backup_media_type
- * - @c bkpinfo->please_dont_eject_when_restoring
  * @param basic_call The call to mkisofs. May contain tokens that will be resolved to actual data. The tokens are:
  * - @c _ISO_ will become the ISO file (@p isofile)

branches/3.1/mondo/src/common/libmondo-mountlist.c

@@ -840 +840 @@
             !strcmp(mountlist->el[items].device, "/sys") ||
             !strcmp(mountlist->el[items].device, "sys") ||
+            !strcmp(mountlist->el[items].device, "/run") ||
+            !strcmp(mountlist->el[items].device, "run") ||
             !strcmp(mountlist->el[items].device, "/devpts") ||
             !strcmp(mountlist->el[items].device, "devpts")

branches/3.1/mondo/src/common/libmondo-raid.c

@@ -1022 +1022 @@
     // get RAID level
     token = mr_strtok(string, delims, &lastpos);
+    // skip potential auto-read-only entry
+    if (!strcmp(token, "(auto-read-only)")) {
+        mr_free(token);
+        token = mr_strtok (string, delims, &lastpos);
+    }
     if (!strcmp(token, "multipath")) {
       raidlist->el[raidlist->entries].raid_level = -2;

branches/3.1/mondo/src/common/libmondo-stream.c

@@ -737 +737 @@
 
     set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+
+    /* restore compression mode on */
+    mr_asprintf(&command, "mt -f %s compression on",bkpinfo->media_device);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
     return(res);
 }

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

@@ -378 +378 @@
     log_msg(1, "Post-param");
     if (bkpinfo->backup_media_type == tape) {
+        if (whine_if_not_found("mt") == 1) {
+            fatal_error("Please install the mt command");
+        }
         log_msg(1, "Tape");
         if (bkpinfo->media_device == NULL) {
@@ -718 +721 @@
         /* purging a potential old tmpdir */
         log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
+        chdir("/tmp");
         mr_asprintf(tmp,"rm -Rf %s",bkpinfo->tmpdir);
         mr_free(bkpinfo->tmpdir);

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

@@ -987 +987 @@
     verify_all_slices_on_CD(mountpoint);
 
-    mr_asprintf(tmp1, "umount %s", mountpoint);
+    mr_asprintf(tmp1, "umount -d %s", mountpoint);
 #ifdef __FreeBSD__
     ret += system(tmp1);
@@ -1118 +1118 @@
 #ifdef __FreeBSD__
     ret = 0;
-    mr_asprintf(command, "umount %s", mountpoint);
+    mr_asprintf(command, "umount -d %s", mountpoint);
     ret += system(command);
     ret += kick_vn(mddevice);
     if (ret) {
 #else
-    mr_asprintf(command, "umount %s", mountpoint);
+    mr_asprintf(command, "umount -d %s", mountpoint);
     if (system(command)) {
 #endif
@@ -1136 +1136 @@
 
     if (!does_file_exist(fname)) {
-        mr_asprintf(command, "umount %s", bkpinfo->media_device);
+        mr_asprintf(command, "umount -d %s", bkpinfo->media_device);
         run_program_and_log_output(command, 2);
         mr_free(command);

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

@@ -262 +262 @@
 char *tmp1 = NULL;
 
-    mr_asprintf(tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);
+    mr_asprintf(tmp,"ps %s | grep \" %s \" | grep -v \"grep\" | awk '{print %s;}'", ps_options, str , ps_proc_id);
     run_program_and_log_output(tmp, TRUE);
     if (strlen(tmp) > 0) {
@@ -320 +320 @@
         chdir("/");
         if (g_selfmounted_isodir) {
-            mr_asprintf(command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
             mr_free(command);
@@ -368 +368 @@
         char *command = NULL;
 
-        chdir("/");
-        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        /*  Before removing dir, make sure we're out of them */
+        chdir("/tmp");
+        run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
-            mr_asprintf(command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             mr_free(command);
@@ -382 +383 @@
             log_msg(8,"tempdir is %s",bkpinfo->tmpdir);
             if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
-                log_msg(8,"erasing tempdir");
+                log_msg(8,"erasing tempdir %s",bkpinfo->tmpdir);
                 mr_asprintf(command, "rm -Rf %s", bkpinfo->tmpdir);
                 system(command);
@@ -391 +392 @@
             log_msg(8,"scratchdir is %s", bkpinfo->scratchdir);
             if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) {
-                log_msg(8,"erasing scratchdir");
+                log_msg(8,"erasing scratchdir %s",bkpinfo->scratchdir);
                 mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir);
                 system(command);
@@ -579 +580 @@
             newtCenteredWindow(40, 7, title);
             g_isoform_main = newtForm(NULL, NULL, 0);
-            g_isoform_timeline = newtLabel(1, 5, "This is the timeline");
-            g_isoform_pcline = newtLabel(1, 6, "This is the pcline");
+            g_isoform_timeline = newtLabel(1, 5, "                    ");
+            g_isoform_pcline = newtLabel(1, 6, "                  ");
             newtFormAddComponents(g_isoform_main, g_isoform_timeline,
                                   g_isoform_pcline, g_isoform_header,
                                   g_isoform_scale, NULL);
+            newtDrawForm(g_isoform_main);
             newtRefresh();
         }
@@ -647 +649 @@
             g_scale = newtScale(3, 6, 54, (long long)g_maximum_progress);
             g_progressForm = newtForm(NULL, NULL, 0);
-            g_percentline = newtLabel(10, 9, "This is the percentline");
-            g_timeline = newtLabel(10, 8, "This is the timeline");
+            g_percentline = newtLabel(10, 9, "                       ");
+            g_timeline = newtLabel(10, 8, "                    ");
             newtFormAddComponents(g_progressForm, g_percentline, g_timeline, g_scale, g_blurb1, g_blurb3, g_blurb2, NULL);
             newtPushHelpLine(b1c);
+            newtDrawForm(g_progressForm);
             newtRefresh();
         }
@@ -969 +972 @@
         }
         if (!g_text_mode) {
+            newtDrawForm(g_isoform_main);
             newtRefresh();
         }
@@ -1100 +1104 @@
             mr_free(percentline_str);
 
+            newtDrawForm(g_progressForm);
             newtRefresh();
         }