Author: sobomax
Date: Tue Mar 8 17:00:31 2011
New Revision: 219400
URL: http://svn.freebsd.org/changeset/base/219400
Log:
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
Modified:
head/sys/geom/label/g_label_ext2fs.c
Modified: head/sys/geom/label/g_label_ext2fs.c
==============================================================================
--- head/sys/geom/label/g_label_ext2fs.c Tue Mar 8 14:18:21 2011
(r219399)
+++ head/sys/geom/label/g_label_ext2fs.c Tue Mar 8 17:00:31 2011
(r219400)
@@ -53,6 +53,7 @@ g_label_ext2fs_taste(struct g_consumer *
{
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 *
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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
