Changeset 729 in MondoRescue for trunk/mondo/mondo/common

Timestamp:

Jul 30, 2006, 4:06:39 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r686:728 $SVN_M/branches/stable

Location:

trunk/mondo/mondo/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-devices.c (modified) (3 diffs)
• libmondo-filelist.c (modified) (1 diff)

trunk/mondo/mondo/common/libmondo-archive.c

@@ -3076 +3076 @@
     } else {
         file_to_openin = biggie_filename;
-        asprintf(&command, "md5sum '%s'", biggie_filename);
+        if (strchr(biggie_filename,'\'') != NULL) {
+            asprintf(&command, "md5sum \"%s\"", biggie_filename);
+        } else {
+            asprintf(&command, "md5sum '%s'", biggie_filename);
+        }
         if (!(fin = popen(command, "r"))) {
             log_OS_error("Unable to popen-in command");

trunk/mondo/mondo/common/libmondo-devices.c

@@ -1575 +1575 @@
             if (bkpinfo->media_device != NULL) {
                 asprintf(&tmp,
-                        _("I think I've found your %s burner at SCSI node %s; am I right on the money?"),
+                        _("I think I've found your %s burner at SCSI node %s; am I right on the money? Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen."),
                         media_descriptor_string(bkpinfo->
                                                 backup_media_type),
@@ -2021 +2021 @@
 {
     return(call_program_and_get_last_line_of_output
-           ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("mount -t coda,ncpfs,nfs,smbfs,cifs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     /* BERLIOS : Useless
     asprintf(&exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
            */
 }
@@ -2072 +2072 @@
 #ifdef __FreeBSD__
     tmp = call_program_and_get_last_line_of_output
-           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
+           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
 #else
     tmp = call_program_and_get_last_line_of_output
-           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
+           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
 #endif
 

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -1355 +1355 @@
         // 2.6 has /sys as a proc-type thing -- must be excluded
         asprintf(&tmp,
-                 "find %s -maxdepth %d -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
+                "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
+                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         asprintf(&tmp,
-                 "find %s -maxdepth %d -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
+                "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
+                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
 #endif
         system(tmp);