--- src/lib/libdisk/open_disk.c	2009-08-03 01:13:06.000000000 -0700
+++ src/lib/libdisk/open_disk.c	2010-07-23 15:09:14.337845551 -0700
@@ -160,6 +160,13 @@ 
 
 		}
 		t = strsep(&p, " ");	/* Type {SUN, BSD, MBR, PC98, GPT} */
+		/*
+		 * Skip LABEL lines.  This solves parsing errors when it
+		 * comes to disks which contain volume labels or glabels
+		 * with spaces, such as FAT-formatted USB flash drives.
+		 */
+		if (!strcmp(t, "LABEL"))
+			continue;
 		n = strsep(&p, " ");	/* name */
 		a = strsep(&p, " ");	/* len */
 		len = strtoimax(a, &r, 0);