Changeset 820 in MondoRescue for branches

Timestamp:

Sep 23, 2006, 2:41:00 PM (19 years ago)

Author:

andree

Message:

AFS support tweaking:

• don't scan fstab for AFS - AFS volumes don't appear in fstab;
• don't exclude AFS volumes per se in open_and_list_dir(), rather don't scan any directories that have been excluded - can generally improve scan times if '-N' or '-E' is used, i.e. not AFS specific (but required for AFS!).

Location:

branches/stable/mondo/mondo/common

Files:

• libmondo-devices.c (modified) (2 diffs)
• libmondo-filelist.c (modified) (3 diffs)

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

@@ -2436 +2436 @@
     strcpy(exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|mvfs) )' | 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;}'"));
     sprintf(result_sz, "%s %s", exclude_these_directories,
             exclude_these_devices);
@@ -2466 +2466 @@
     strcpy(exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|mvfs) )' | 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;}'"));
     sprintf(result_sz, "%s", exclude_these_directories);
     paranoid_free(exclude_these_devices);

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

@@ -1487 +1487 @@
                       time_t time_of_last_full_backup)
 {
+    const char delims[] = " ";
+
     DIR *dip;
     struct dirent *dit;
@@ -1497 +1499 @@
     char *skip_these;
     char *new_with_spaces;
+    char *strtmp;
+    char *token;
+    char *find_excludes;
     static char *name_of_evalcall_form;
     int i;
+    int lastpos = 0;
     static int depth = 0;
     char *p;
@@ -1522 +1528 @@
         malloc_string(name_of_evalcall_form);
         malloc_string(find_skeleton_marker);
+        asprintf(&find_excludes, " ");
+        while((token = mr_strtok (sth, delims, &lastpos))) {
+          asprintf(&strtmp,"%s", find_excludes);
+          paranoid_free(find_excludes);
+          asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
+          paranoid_free(strtmp);
+          paranoid_free(token);
+        }
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        sprintf(tmp,
-                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -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);
+        asprintf(&strtmp,
+             "find %s -maxdepth %d -fstype mvfs -path /dev/shm -prune -o %s -type d -a -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
-        sprintf(tmp,
-                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
+        asprintf(&strtmp,
+             "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -a -print > %s 2> /dev/null",
+                dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #endif
-        system(tmp);
+        paranoid_free(find_excludes);
+        log_msg(5, "find command = %s", strtmp);
+        system(strtmp);
+        paranoid_free(strtmp);
         sprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
         g_skeleton_entries =