Changeset 2160 in MondoRescue

Timestamp:

Mar 6, 2009, 10:53:57 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Exclude filesystems type ptmpfs and devpts from being parsed. Should solve aproblem seen with large /dev/shm being backed up.

Location:

branches/2.2.9/mondo/src/common

Files:

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

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

@@ -378 +378 @@
     }
 
-    /*
-    if (g_tmpfs_mountpt[0] != '\0') {
-        i = atoi(call_program_and_get_last_line_of_output
-                 ("df -m -P | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4"));
-        if (i > 0) {
-            if (free_ramdisk_space > i) {
-                free_ramdisk_space = i;
-                log_msg(2, "min(free_ramdisk_space) is now %d",
-                        free_ramdisk_space);
-                if (free_ramdisk_space < 10) {
-                    fatal_error
-                        ("Please increase PPCFG_RAMDISK_SIZE in my-stuff.h to increase size of ramdisk ");
-                }
-            }
-        }
-    }
-    */
     paranoid_free(command);
     paranoid_free(zipparams);

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

@@ -1405 +1405 @@
         // 2.6 has /sys as a proc-type thing -- must be excluded
         asprintf(&strtmp,
-             "find %s -maxdepth %d -fstype mvfs -prune -o -path /dev/shm -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null",
+             "find %s -maxdepth %d -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, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else

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

@@ -473 +473 @@
     run_program_and_log_output("cat /etc/*-release", 5);
     run_program_and_log_output("cat /etc/*issue*", 5);
-    /*
-    sprintf(g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir);
-    sprintf(command, "mkdir -p %s", g_tmpfs_mountpt);
-    paranoid_system(command);
-    rdsiz_MB = PPCFG_RAMDISK_SIZE + g_tape_buffer_size_MB;
-    */
 #ifdef __FreeBSD__
-    /*
-    strcpy(tmp,
-           call_program_and_get_last_line_of_output
-           ("vmstat | tail -1 | tr -s ' ' | cut -d' ' -f6"));
-    avm += atol(tmp);
-    strcpy(tmp,
-           call_program_and_get_last_line_of_output
-           ("swapinfo | grep -v Device | tr -s ' ' | cut -d' ' -f4 | tr '\n' '+' | sed 's/+$//' | bc"));
-    avm += atol(tmp);
-    sprintf(command, "mdmfs -s %d%c md9 %s", rdsiz_MB, 'm',
-            g_tmpfs_mountpt);
-            */
 #else
-    /*
-    strcpy(tmp,
-           call_program_and_get_last_line_of_output
-           ("free | grep ':' | tr -s ' ' '\t' | cut -f2 | head -n1"));
-    avm += atol(tmp);
-    sprintf(command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
-            g_tmpfs_mountpt, rdsiz_MB, 'm');
-            */
     run_program_and_log_output("cat /proc/cpuinfo", 5);
     run_program_and_log_output
@@ -506 +480 @@
          5);
 #endif
-    /*
-    if (avm / 1024 > rdsiz_MB * 3) {
-        if (run_program_and_log_output(command, 5)) {
-            g_tmpfs_mountpt[0] = '\0';
-            log_it("Failed to mount tmpfs");
-        } else {
-            log_it("Tmpfs mounted OK - %d MB", rdsiz_MB);
-        }
-    } else {
-        g_tmpfs_mountpt[0] = '\0';
-        log_it("It doesn't seem you have enough swap to use tmpfs. Fine.");
-    }
-    */
 
     if (bkpinfo->use_lzo) {