Changeset 2444 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.c

Timestamp:

Sep 30, 2009, 4:44:40 AM (15 years ago)

Author:

Bruno Cornec

Message:

• priority given to env var for tmpdir
• fuse FS excluded from tmpdir computation
• Improves udev timeout handling
• fuse device is needed at restore time for sshfs
• Avoids comment analysis in the new code handling deplist.d
• Avoids error message if some ssh conf files do not exist
• Improvements on sshfs/ssh management in restore mode
• Include now all minimal requirements for sshfs
• Fix udev support in init for Mandriva 2009.1 (udevadm settle is blocking)
• Improve deplist.d/* files
• adds libnss for ssh support in boot disk
• Solve a memory management issue in DSF module (strtok => mr_strtok)
• DSF now also supports partitions in addition to full disks
• Adds debug in open_and_list_dir
• Improve user management for NetFS cases
• ssh in the restore env needs some dlopened libs (libnss_compat|files)
• Warning emited in case of duplicate mountpoints or devices in fstab found
• Use only the AWK veriable everywhere and not the awk command
• Simplify GetInitrdFilesystemToUse which doesn't need to detect everything, but just know if it's initramfs (new mode) or a compressed FS ext2/3 (older mode) as initrd is anyway re-made by mindi. Should fix #353

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/common/libmondo-filelist.c (modified) (5 diffs)

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

@@ -29 +29 @@
 
 
-extern ssize_t getline(char **lineptr, size_t * n, FILE * stream);
 extern char *MONDO_LOGFILE;
 
@@ -1347 +1346 @@
     /* dir is needed when we pass it to the shell */
     dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
-    p = strrchr(dir, '/');
+    p = strrchr(dir1, '/');
     if (p) {
         if (!strcmp(p, "/.") || !strcmp(p, "/..")) {
@@ -1428 +1427 @@
         mr_free(tmp);
     } else if (strstr(skip_these, new_with_spaces)) {
+        log_msg(10, "Found dir ***%s**** excluded", dir1);
         fprintf(fout, "%s\n", dir1);    // if excluded dir then print dir ONLY
     } else {
+        log_msg(10, "Found dir ***%s**** parsed", dir1);
         fprintf(fout, "%s\n", dir1);
         while ((dit = readdir(dip)) != NULL) {
@@ -1442 +1443 @@
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
+                log_msg(10, "Found child dir ***%s**** excluded", new);
                 mr_free(new_with_spaces);
             } else {
@@ -1448 +1450 @@
                     if (!S_ISLNK(statbuf.st_mode)
                         && S_ISDIR(statbuf.st_mode)) {
+                        log_msg(10, "Found child dir ***%s**** parsed", new);
                         open_and_list_dir(new, skip_these, fout, time_of_last_full_backup);
                     } else {
                         if (time_of_last_full_backup == 0 || time_of_last_full_backup < statbuf.st_ctime) {
+                            log_msg(10, "Found child file ***%s**** parsed", new);
                             fprintf(fout, "%s\n", new);
                             if ((counter++) > 128) {