--- a/usr/src/cmd/gui-install/aux/INSTALL_DISK_PANEL.txt Tue Jun 19 08:37:54 2012 +0200
+++ b/usr/src/cmd/gui-install/aux/INSTALL_DISK_PANEL.txt Tue Jun 19 02:42:18 2012 -0600
@@ -3,7 +3,7 @@
This panel enables you to choose a disk, or a partition on a disk, as the installation target. The panel also enables you to make adjustments to the partition layout, such as deleting existing partitions or creating a Solaris partition.
-Recommended size and minimum size for installation of the Oracle Solaris operating system (OS) are displayed in this panel.
+Minimum size and recommended minimum size for installation of the Oracle Solaris operating system (OS) are displayed in this panel.
Procedure
--- a/usr/src/cmd/gui-install/src/disk_screen.py Tue Jun 19 08:37:54 2012 +0200
+++ b/usr/src/cmd/gui-install/src/disk_screen.py Tue Jun 19 02:42:18 2012 -0600
@@ -381,8 +381,8 @@
selected_disk.disk_prop.dev_size < \
self._target_controller.recommended_target_size:
- LOGGER.info("Disk smaller than recommended")
- LOGGER.info("Recommended size is %s",
+ LOGGER.info("Disk smaller than recommended minimum")
+ LOGGER.info("Recommended minimum size is %s",
self._target_controller.recommended_target_size)
if selected_disk.disk_prop is not None and \
selected_disk.disk_prop.dev_size is not None:
@@ -398,7 +398,7 @@
"applications."),
two_buttons=True)
if not ok_to_proceed:
- self._raise_error("Disk smaller than recommended")
+ self._raise_error("Disk smaller than recommended minimum")
# WARNING #2 - Solaris partition is smaller than recommended size
# Identify the correct Solaris Partition or GPTPartition object.
@@ -412,8 +412,8 @@
if solaris_partition.size < \
self._target_controller.recommended_target_size:
- LOGGER.info("Partition smaller than recommended")
- LOGGER.info("Recommended size is %s",
+ LOGGER.info("Partition smaller than recommended minimum")
+ LOGGER.info("Recommended minimum size is %s",
self._target_controller.recommended_target_size)
LOGGER.info("Partition size is (%s)", solaris_partition.size)
@@ -424,7 +424,8 @@
"applications."),
two_buttons=True)
if not ok_to_proceed:
- self._raise_error("Partition smaller than recommended")
+ self._raise_error("Partition smaller than recommended "
+ "minimum")
# Save the TargetController in the DOC (used to retrieve the
# minimum_target_size and call setup_vfstab_for_swap())
@@ -694,7 +695,7 @@
# NB This messing about is because we want to re-use the existing
# localized size formatting string from C, but the Python formatting
# options are different
- size_str = _("Recommended size: %lldGB Minimum: %.1fGB")
+ size_str = _("Recommended minimum: %lldGB Minimum: %.1fGB")
size_str = size_str.replace('%lld', '%s')
size_str = size_str.replace('%.1f', '%s')
--- a/usr/src/cmd/text-install/disk_selection.py Tue Jun 19 08:37:54 2012 +0200
+++ b/usr/src/cmd/text-install/disk_selection.py Tue Jun 19 02:42:18 2012 -0600
@@ -73,8 +73,8 @@
HEADER_TEXT = _("Disks")
PARAGRAPH = _("Where should %(release)s be installed?") % RELEASE
- REC_SIZE_TEXT = _("Recommended size: ")
- MIN_SIZE_TEXT = _(" Minimum size: ")
+ REC_SIZE_TEXT = _("Recommended minimum: ")
+ MIN_SIZE_TEXT = _("Minimum size: ")
DISK_SEEK_TEXT = _("Seeking disks on system")
FOUND_x86 = _("The following partitions were found on the disk.")
FOUND_SPARC = _("The following slices were found on the disk.")
@@ -199,8 +199,8 @@
self.recommended_size.get(Size.gb_units)) + LOCALIZED_GB
min_size_str = locale.format("%.1f",
self.minimum_size.get(Size.gb_units)) + LOCALIZED_GB
- self._size_line = DiskScreen.REC_SIZE_TEXT + rec_size_str + \
- DiskScreen.MIN_SIZE_TEXT + min_size_str
+ self._size_line = DiskScreen.MIN_SIZE_TEXT + min_size_str + \
+ " " + DiskScreen.REC_SIZE_TEXT + rec_size_str
return self._size_line
--- a/usr/src/cmd/text-install/helpfiles/disks.txt Tue Jun 19 08:37:54 2012 +0200
+++ b/usr/src/cmd/text-install/helpfiles/disks.txt Tue Jun 19 02:42:18 2012 -0600
@@ -10,7 +10,7 @@
SIZE
-The recommended size and minimum size for the Oracle Solaris OS installation are displayed.
+The minimum size and recommended minimum size for the Oracle Solaris OS installation are displayed.
* Devices that are too small for a successful installation are labeled that way.