--- a/usr/src/cmd/format/menu_command.c	Mon Oct 31 12:16:22 2005 -0800
+++ b/usr/src/cmd/format/menu_command.c	Mon Oct 31 14:14:27 2005 -0800
@@ -1453,6 +1453,7 @@
 
 		(void) memset((char *)&label, 0, sizeof (struct dk_label));
 
+		(void) strcpy(x86_devname, cur_disk->disk_name);
 		if (cur_ctype->ctype_ctype == DKC_DIRECT)
 			dptr = auto_direct_get_geom_label(cur_file,  &label);
 		else

--- a/usr/src/cmd/format/menu_fdisk.c	Mon Oct 31 12:16:22 2005 -0800
+++ b/usr/src/cmd/format/menu_fdisk.c	Mon Oct 31 14:14:27 2005 -0800
@@ -579,8 +579,7 @@
 	char		pbuf[MAXPATHLEN];
 
 
-	get_pname(&pbuf[0]);
-
+	(void) snprintf(pbuf, sizeof (pbuf), "/dev/rdsk/%sp0", x86_devname);
 	if ((fd = open_disk(pbuf, O_RDONLY)) < 0) {
 		err_print("Error: can't open selected disk '%s'.\n", pbuf);
 		return (-1);