From 20cc2dc42ecf312649a75b517f6bc024c0ff6b51 Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Tue, 8 Mar 2011 17:00:31 +0000
Subject: [PATCH] Some linux distros put mount point into the ext2fs labels,
 such as '/', or '/boot', which confuses the devfs code and can cause userland
 programs to fail reading /dev/ext2fs directory with weird error code, such as
 any program that uses pwlib.

Strip any leading slashes before feeding the label to the geom_label code.

Sponsored by:	Sippy Software, Inc.

MFC after:	1 week
---
 sys/geom/label/g_label_ext2fs.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/geom/label/g_label_ext2fs.c b/sys/geom/label/g_label_ext2fs.c
index 2e004930730..1c2eeb856bc 100644
--- a/sys/geom/label/g_label_ext2fs.c
+++ b/sys/geom/label/g_label_ext2fs.c
@@ -53,6 +53,7 @@ g_label_ext2fs_taste(struct g_consumer *cp, char *label, size_t size)
 {
 	struct g_provider *pp;
 	e2sb_t *fs;
+	char *s_volume_name;
 
 	g_topology_assert_not();
 	pp = cp->provider;
@@ -74,13 +75,18 @@ g_label_ext2fs_taste(struct g_consumer *cp, char *label, size_t size)
 		goto exit_free;
 	}
 
+	s_volume_name = fs->s_volume_name;
+	/* Terminate label */
+	s_volume_name[sizeof(fs->s_volume_name) - 1] = '\0';
+
+	if (s_volume_name[0] == '/')
+		s_volume_name += 1;
+
 	/* Check for volume label */
-	if (fs->s_volume_name[0] == '\0')
+	if (s_volume_name[0] == '\0')
 		goto exit_free;
 
-	/* Terminate label */
-	fs->s_volume_name[sizeof(fs->s_volume_name) - 1] = '\0';
-	strlcpy(label, fs->s_volume_name, size);
+	strlcpy(label, s_volume_name, size);
 
 exit_free:
 	g_free(fs);