Changeset 2651 in MondoRescue

Timestamp:

Jun 13, 2010, 12:50:02 PM (14 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2634:2650 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.9

• Update Lab logos
• update mondo lab + pres
• Fix #425: Do not blindly umount partitions at end of mindi
• Attempt to fix problem of slowdown in filelist creation by re-introducing a limit to the find command
• Remove warning if libata not found

Location:

branches/2.2.10

Files:

• mindi/mindi (modified) (3 diffs)
• mondo-doc/LabMondoRescue.odt (modified) ( previous)
• mondo/src/common/libmondo-filelist.c (modified) (2 diffs)

branches/2.2.10/mindi/mindi

@@ -240 +240 @@
 # Parameter is exit code value
 MindiExit() {
-    local my_partitions
-
     LogFile "Mindi $MINDI_VERSION is exiting" 
     LogFile "End date : `date`" 
@@ -253 +251 @@
     sync&
 
-    # Unmount what could remain mounted
-    my_partitions=`mount | grep -F $MINDI_TMP | cut -f1 -d' '`
-    [ "$my_partitions" != "" ] && umount $my_partitions
     # Clean temporary files only when standalone mindi
     if [ _"$MINDI_TMP" != _"$MONDO_TMP" ]; then
@@ -2574 +2569 @@
 
 # Compute libata version
-laver=`modinfo libata | grep -Ei '^Version:' | cut -d: -f2 | cut -d. -f1 | sed 's/  *//g' 2> /dev/null`
+laver=`modinfo libata 2> /dev/null | grep -Ei '^Version:' | cut -d: -f2 | cut -d. -f1 | sed 's/  *//g' 2> /dev/null`
 # If libata v2 is used then remove ide-generic as it will perturbate boot
 if [ "`echo $MODULES | grep libata`" ]; then

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

@@ -1356 +1356 @@
             }
         }
+
+/**
+ * The maximum depth of directories to put in the skeleton filelist.
+ * This is a balance between performance and a good progress indicator.
+ */
+#define MAX_SKEL_DEPTH  3
+
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        mr_asprintf(strtmp, "find '%s' -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, 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 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);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        mr_asprintf(strtmp, "find '%s' -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #endif
         mr_free(find_excludes);
@@ -1383 +1390 @@
         log_msg(5, "entries = %ld", g_skeleton_entries);
         percentage = 0;
-    } else  // update evalcall form if appropriate
+    } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
     {
         mr_asprintf(find_skeleton_marker, "grep -Fv '%s' %s > %s.new 2> /dev/null", dir, g_skeleton_filelist, g_skeleton_filelist);