Changeset 2918 in MondoRescue for branches/3.0/mondo

Timestamp:

Dec 20, 2011, 1:18:09 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Exclude /run similarly to /sys and /proc

Location:

branches/3.0/mondo/src/common

Files:

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

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

@@ -1382 +1382 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        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);
+        mr_asprintf(&strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype devtmpfs -prune -o -fstype proc -prune -o -fstype selinuxfs -prune -o -fstype securityfs -prune -o -fstype hugetlbfs -o -fstype cgroup -prune -prune -o -fstype mqueue -prune -o -fstype debugfs -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);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
@@ -1616 +1616 @@
         paranoid_free(tmp1);
 
-        mr_asprintf(&exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_asprintf(&exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
         if (excp != NULL) {
             mr_strcat(exclude_paths,"|%s",excp);

branches/3.0/mondo/src/common/libmondo-mountlist.c

@@ -855 +855 @@
             !strcmp(mountlist->el[items].device, "/sys") ||
             !strcmp(mountlist->el[items].device, "sys") ||
+            !strcmp(mountlist->el[items].device, "/run") ||
+            !strcmp(mountlist->el[items].device, "run") ||
             !strcmp(mountlist->el[items].device, "/devpts") ||
             !strcmp(mountlist->el[items].device, "devpts")