[dm-devel] multipath-tools/multipathd main.c

[bmarzins at sourceware.org]

CVSROOT:	/cvs/dm
Module name:	multipath-tools
Branch: 	RHEL5_FC6
Changes by:	bmarzins at sourceware.org	2009-09-10 16:27:24

Modified files:
	multipathd     : main.c 

Log message:
	The only /var subdirectories that multipathd needs in its private namespace are
	/var/lib and /var/run. Drop the others. Not Applicable upstream.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipathd/main.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.69.2.23&r2=1.69.2.24

--- multipath-tools/multipathd/main.c	2009/08/19 21:52:40	1.69.2.23
+++ multipath-tools/multipathd/main.c	2009/09/10 16:27:24	1.69.2.24
@@ -1288,9 +1288,9 @@
 		    strcmp(mnt, "/usr") == 0 || strncmp(mnt, "/usr/lib", 8) == 0 ||
 		    strcmp(mnt, "/etc") == 0 || strncmp(mnt, "/proc", 5) == 0 ||
 		    strncmp(mnt, "/dev", 4) == 0 || strncmp(mnt, "/sys", 4) == 0 ||
-		    strncmp(mnt, "/var", 4) == 0 || strncmp(mnt, "/lib", 4) == 0 ||
-		    strncmp(mnt, "/lib64", 6) == 0 ||
-		    strncmp(mnt, "/usr/lib64", 10) == 0)
+		    strcmp(mnt, "/var") == 0 || strncmp(mnt, "/var/lib", 8) == 0 ||
+		    strncmp(mnt, "/var/run", 8) || strncmp(mnt, "/lib", 4) == 0 ||
+		    strncmp(mnt, "/lib64", 6) == 0 || strncmp(mnt, "/usr/lib64", 10) == 0)
 			continue;
 		if (umount2(mnt, MNT_DETACH) < 0 && errno != ENOENT) {
 			condlog(0, "failed to umount '%s' (%s). skipping", mnt, strerror(errno));