rpms/util-linux/FC-3 util-linux-2.12a-lvm2dupes-76467.patch, NONE, 1.1 util-linux.spec, 1.55, 1.56

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/util-linux/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv20245

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.12a-lvm2dupes-76467.patch 
Log Message:
- fix #156949, #76467 - mount reads information about dm- LABELs two times

util-linux-2.12a-lvm2dupes-76467.patch:
 mount_by_label.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE util-linux-2.12a-lvm2dupes-76467.patch ---
--- util-linux-2.12a/mount/mount_by_label.c.kzak	2005-05-06 00:22:53.140994600 +0200
+++ util-linux-2.12a/mount/mount_by_label.c	2005-05-06 00:24:03.966227528 +0200
@@ -192,6 +192,15 @@
 	return 1;
 }
 
+/* We need to avoid listing /dev/dm-X devices, because they are added to the uuidcache separately by the
+   uuidcache_init_dm routine. Duplicate entries cause mount-by-label to fail.
+ */
+static int
+is_lvm2(char *ptname)
+{
+	return !strncmp(ptname, "dm-", 3);
+}
+
 static void
 uuidcache_init(void) {
 	char line[100];
@@ -260,7 +269,7 @@
 		/* devfs has .../disc and .../part1 etc. */
 
 		for(s = ptname; *s; s++);
-		if (isdigit(s[-1]) || is_xvm(ptname)) {
+		if ((isdigit(s[-1]) || is_xvm(ptname)) && !is_lvm2(ptname)) {
 			
 		/*
 		 * Note: this is a heuristic only - there is no reason


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-3/util-linux.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- util-linux.spec	2 May 2005 16:55:37 -0000	1.55
+++ util-linux.spec	5 May 2005 22:26:18 -0000	1.56
@@ -21,7 +21,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.12a
-Release: 24.1
+Release: 24.2
 License: distributable
 Group: System Environment/Base
 
@@ -117,6 +117,8 @@
 Patch166: util-linux-2.12p-nfsman.patch
 # 156597 - look - doesn't work with separators
 Patch167: util-linux-2.12p-look-separator.patch
+# 76467 - At boot time, fsck chokes on LVs listed by label in fstab
+Patch168: util-linux-2.12a-lvm2dupes-76467.patch
 
 
 # patches required for NFSv4 support
@@ -250,6 +252,7 @@
 %patch165 -p1
 %patch166 -p1
 %patch167 -p1
+%patch168 -p1
 
 %patch1000 -p1 -b .nfsv4
 %patch1001 -p1
@@ -631,6 +634,9 @@
 /sbin/losetup
 
 %changelog
+* Fri May  6 2005 Karel Zak <kzak at edhat.com> 2.12a-24.2
+- fix #156949, #76467 - mount reads information about dm- LABELs two times
+
 * Mon May  2 2005 Karel Zak <kzak at edhat.com> 2.12a-24.1
 - fix #156597 - look - doesn't work with separators
 - fix #154202 - wrong duplicate labels detection