Changeset 2651


Ignore:
Timestamp:
Jun 13, 2010, 12:50:02 PM (9 years ago)
Author:
bruno
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/mindi

    r2644 r2651  
    240240# Parameter is exit code value
    241241MindiExit() {
    242     local my_partitions
    243 
    244242    LogFile "Mindi $MINDI_VERSION is exiting"
    245243    LogFile "End date : `date`"
     
    253251    sync&
    254252
    255     # Unmount what could remain mounted
    256     my_partitions=`mount | grep -F $MINDI_TMP | cut -f1 -d' '`
    257     [ "$my_partitions" != "" ] && umount $my_partitions
    258253    # Clean temporary files only when standalone mindi
    259254    if [ _"$MINDI_TMP" != _"$MONDO_TMP" ]; then
     
    25742569
    25752570# Compute libata version
    2576 laver=`modinfo libata | grep -Ei '^Version:' | cut -d: -f2 | cut -d. -f1 | sed 's/  *//g' 2> /dev/null`
     2571laver=`modinfo libata 2> /dev/null | grep -Ei '^Version:' | cut -d: -f2 | cut -d. -f1 | sed 's/  *//g' 2> /dev/null`
    25772572# If libata v2 is used then remove ide-generic as it will perturbate boot
    25782573if [ "`echo $MODULES | grep libata`" ]; then
  • branches/2.2.10/mondo/src/common/libmondo-filelist.c

    r2643 r2651  
    13561356            }
    13571357        }
     1358
     1359/**
     1360 * The maximum depth of directories to put in the skeleton filelist.
     1361 * This is a balance between performance and a good progress indicator.
     1362 */
     1363#define MAX_SKEL_DEPTH  3
     1364
    13581365#if linux
    13591366        // 2.6 has /sys as a proc-type thing -- must be excluded
    1360         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);
     1367        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);
    13611368#else
    13621369        // On BSD, for example, /sys is the kernel sources -- don't exclude
    1363         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);
     1370        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);
    13641371#endif
    13651372        mr_free(find_excludes);
     
    13831390        log_msg(5, "entries = %ld", g_skeleton_entries);
    13841391        percentage = 0;
    1385     } else // update evalcall form if appropriate
     1392    } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
    13861393    {
    13871394        mr_asprintf(find_skeleton_marker, "grep -Fv '%s' %s > %s.new 2> /dev/null", dir, g_skeleton_filelist, g_skeleton_filelist);
Note: See TracChangeset for help on using the changeset viewer.