Changeset 2548 in MondoRescue for branches/2.2.9/mondo/src

Timestamp:

Jan 25, 2010, 2:24:23 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Adds some logs for filelist creation
• Remove option -P from getfattr which may also skip symlinks - Attempt to solve #388
• Exclude rpc_pipefs type of filesystems from find

Location:

branches/2.2.9/mondo/src/common

Files:

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

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

@@ -1024 +1024 @@
     sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
             bkpinfo->tmpdir, 0L);
-    for (archiving_set_no = 0; does_file_exist(archiving_filelist_fname);
+    for (archiving_set_no = 0L; does_file_exist(archiving_filelist_fname);
          sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, archiving_set_no)) {

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

@@ -282 +282 @@
         }
         if (siz > max_sane_size_for_a_file) {
+            log_msg(10, "Adding %s to big files\n", incoming);
             fprintf(fbig, "%s\n", incoming);
         } else {
             curr_set_size += siz;
+            log_msg(10, "Adding %s to filelist %d\n", incoming, curr_set_no);
             fprintf(fout, "%s\n", incoming);
             if (curr_set_size > maxsetsizeK) {
@@ -475 +477 @@
         mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);  // " MONDO_LOGFILE);
         paranoid_free(strtmp);
+        log_msg(20,"calling %s\n",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
         paranoid_free(syscall);
@@ -516 +519 @@
         mr_free(command);
         retval =
-            gen_aux_list(filelist, "getfattr --en=hex -P -m - -d \"%s\"",
+            gen_aux_list(filelist, "getfattr --en=hex -m - -d \"%s\"",
                          fattr_fname);
     }
@@ -1366 +1369 @@
 #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 %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
+        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 %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude