$OpenBSD: patch-hotplug-diskmount_c,v 1.1 2015/10/27 11:32:31 sthen Exp $
--- hotplug-diskmount.c.orig	Tue Oct 27 05:29:38 2015
+++ hotplug-diskmount.c	Tue Oct 27 05:30:47 2015
@@ -146,24 +146,24 @@ prepare_disk_name(char *dskname, struct disklabel *lab
 
 	/* Skip leading spaces */
 	for (i = 0; i < DISKNAME_SIZE - 1; i++) {
-		if (!isspace(label->d_un.un_d_packname[i]))
+		if (!isspace(label->d_packname[i]))
 			break;
 	}
 
 	/* Skip trailing spaces */
 	st = i;
 	for (i = DISKNAME_SIZE - 1; i > st; i--) {
-		if (!isspace(label->d_un.un_d_packname[i - 1]) &&
-		    label->d_un.un_d_packname[i - 1] != '\0')
+		if (!isspace(label->d_packname[i - 1]) &&
+		    label->d_packname[i - 1] != '\0')
 			break;
 	}
 	sz = i;
 
 	for (i = st, j = 0; i < sz; i++, j++) {
-		if (label->d_un.un_d_packname[i] == '/')
+		if (label->d_packname[i] == '/')
 			dskname[j] = '_';
 		else
-			dskname[j] = label->d_un.un_d_packname[i];
+			dskname[j] = label->d_packname[i];
 	}
 	dskname[j] = '\0';
 
