Changeset 2918 in MondoRescue

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

Files:

• mindi/rootfs/etc/init.d/rcS (modified) (1 diff)
• mondo-doc/mondoarchive.8 (modified) (1 diff)
• mondo-doc/mondorescue-howto.sgml (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (2 diffs)
• mondo/src/common/libmondo-mountlist.c (modified) (1 diff)

branches/3.0/mindi/rootfs/etc/init.d/rcS

@@ -756 +756 @@
 done
 #/bin/update
+mkdir /proc 2> /dev/null
 mount /proc/ /proc -v -t proc 
 mkdir /sys 2> /dev/null

branches/3.0/mondo-doc/mondoarchive.8

@@ -161 +161 @@
 This is the prefered and recommended option when doing partial archiving.
 Note that mondo automatically excludes removable media (/mnt/floppy,
-/mnt/cdrom, /proc, /sys, /tmp). For example, if you are backing up to an NFS mount but you
+/mnt/cdrom, /proc, /sys, /run, /tmp). For example, if you are backing up to an NFS mount but you
 do not want to include the contents of the mount in a backup, exclude your
 local mount-point with this switch. It will also work with partitions, e.g.

branches/3.0/mondo-doc/mondorescue-howto.sgml

@@ -322 +322 @@
 </entry>
 <entry>
-If you want to backup the whole computer (excluding /sys and /proc,
-naturally) then leave this as / which is the default. Otherwise,
+        If you want to backup the whole computer (excluding /sys, /run and /proc,
+        naturally as well as /tmp) then leave this as / which is the default. Otherwise,
 specify subsets, (e.g. /usr/local /home ) being sure to put a space
 in between each path.

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")