5624 The installation Review Settings page should show the proper disk name. Build121
authorMatt <matt.keenan@sun.com>
Thu, 12 Feb 2009 09:47:56 +0000
changeset 590 bb3a5ad70016
parent 589 30d44ba7d82f
child 591 5fd67aa6fe6d
5624 The installation Review Settings page should show the proper disk name.
usr/src/cmd/gui-install/src/confirmation-screen.c
--- a/usr/src/cmd/gui-install/src/confirmation-screen.c	Thu Feb 12 09:45:04 2009 +0000
+++ b/usr/src/cmd/gui-install/src/confirmation-screen.c	Thu Feb 12 09:47:56 2009 +0000
@@ -332,12 +332,12 @@
 			}
 
 			if (diskSize == partitionSize) {
-				if (InstallationProfile.disktype != NULL) {
+				if (InstallationProfile.diskname != NULL) {
 					tmpStr =
 						g_strdup_printf(
 							_("%.1f GB disk (%s)"),
 							diskSize,
-							InstallationProfile.disktype);
+							InstallationProfile.diskname);
 				} else {
 					tmpStr =
 						g_strdup_printf(
@@ -347,13 +347,13 @@
 				tmpErr =
 					g_strdup(_("This disk will be erased"));
 			} else {
-				if (InstallationProfile.disktype != NULL) {
+				if (InstallationProfile.diskname != NULL) {
 					tmpStr =
 						g_strdup_printf(
 							_("%.1f GB partition on %.1f GB disk (%s)"),
 							partitionSize,
 							diskSize,
-							InstallationProfile.disktype);
+							InstallationProfile.diskname);
 				} else {
 					tmpStr =
 						g_strdup_printf(
@@ -507,12 +507,12 @@
 			diskSize = InstallationProfile.disksize;
 
 			if (InstallationProfile.releasename != NULL) {
-				if (InstallationProfile.disktype != NULL) {
+				if (InstallationProfile.diskname != NULL) {
 					tmpStr =
 						g_strdup_printf(
 							_("%.1f GB disk (%s) with %s"),
 							diskSize,
-							InstallationProfile.disktype,
+							InstallationProfile.diskname,
 							InstallationProfile.releasename);
 				} else {
 					tmpStr =
@@ -522,12 +522,12 @@
 							InstallationProfile.releasename);
 				}
 			} else {
-				if (InstallationProfile.disktype != NULL) {
+				if (InstallationProfile.diskname != NULL) {
 					tmpStr =
 						g_strdup_printf(
 							_("%.1f GB disk (%s)"),
 							diskSize,
-							InstallationProfile.disktype);
+							InstallationProfile.diskname);
 				} else {
 					tmpStr =
 						g_strdup_printf(