From: Karel Zak <kzak@redhat.com>
Date: Thu, 6 Mar 2008 14:43:41 +0000 (+0100)
Subject: mount: don't canonicalize LABEL= or UUID= spec
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ec69c388244c9d9b25693d708883bda7086e3fa;p=util-linux

mount: don't canonicalize LABEL= or UUID= spec

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/mount/fstab.c b/mount/fstab.c
index ada8d322..277f4f1d 100644
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -433,7 +433,13 @@ getfs_by_devname (const char *devname) {
 
 	/* noncanonical devname in fstab */
 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
-		char *fs = canonicalize(mc->m.mnt_fsname);
+		char *fs;
+
+		if (strncmp(mc->m.mnt_fsname, "LABEL=", 6) == 0 ||
+				strncmp(mc->m.mnt_fsname, "UUID=", 5) == 0)
+			continue;
+
+		fs = canonicalize(mc->m.mnt_fsname);
 		if (streq(fs, devname)) {
 			free(fs);
 			return mc;