Index: stand/i386/libi386/devicename.c
===================================================================
--- stand/i386/libi386/devicename.c
+++ stand/i386/libi386/devicename.c
@@ -175,26 +175,9 @@
 char *
 i386_fmtdev(void *vdev)
 {
-    struct i386_devdesc	*dev = (struct i386_devdesc *)vdev;
-    static char		buf[128];	/* XXX device length constant? */
+	struct devdesc	*dev = (struct devdesc *)vdev;
 
-    switch(dev->dd.d_dev->dv_type) {
-    case DEVT_NONE:
-	strcpy(buf, "(no device)");
-	break;
-
-    case DEVT_CD:
-    case DEVT_NET:
-	sprintf(buf, "%s%d:", dev->dd.d_dev->dv_name, dev->dd.d_unit);
-	break;
-
-    case DEVT_DISK:
-	return (disk_fmtdev(vdev));
-
-    case DEVT_ZFS:
-	return(zfs_fmtdev(vdev));
-    }
-    return(buf);
+	return (devformat(dev));
 }