--- a/usr/src/cmd/gui-install/SUNWgui-install.spec Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/SUNWgui-install.spec Tue Aug 16 20:54:07 2011 +0000
@@ -30,7 +30,7 @@
%include Solaris.inc
Name: SUNWgui-install
-Summary: Updated Solaris installation GUI
+Summary: Updated OpenIndiana installation GUI
Version: 0.2
Source: gui-install-%{version}.tar.bz2
Source1: gui-install-01-locale-data.tar.bz2
--- a/usr/src/cmd/gui-install/src/callbacks.c Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/callbacks.c Tue Aug 16 20:54:07 2011 +0000
@@ -930,7 +930,7 @@
retval = gui_install_prompt_dialog(TRUE, FALSE, FALSE,
GTK_MESSAGE_WARNING,
- _("No upgradeable Oracle Solaris Environments"),
+ _("No upgradeable OpenIndiana Environments"),
_("Would you like to install?"));
return (retval);
}
--- a/usr/src/cmd/gui-install/src/confirmation-screen.c Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/confirmation-screen.c Tue Aug 16 20:54:07 2011 +0000
@@ -392,7 +392,7 @@
add_detail_hbox(
MainWindow.ConfirmationWindow.softwarevbox,
FALSE, FALSE,
- _("Oracle Solaris"),
+ _("OpenIndiana"),
NULL);
/* Timezone Information */
@@ -540,7 +540,7 @@
add_detail_hbox(
MainWindow.ConfirmationWindow.softwarevbox,
FALSE, FALSE,
- _("Oracle Solaris"),
+ _("OpenIndiana"),
NULL);
add_detail_hbox(
--- a/usr/src/cmd/gui-install/src/diskbutton.glade Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/diskbutton.glade Tue Aug 16 20:54:07 2011 +0000
@@ -127,7 +127,7 @@
<widget class="GtkLabel" id="disking_label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><span font_desc="Bold">No Oracle Solaris environments</span></property>
+ <property name="label" translatable="yes"><span font_desc="Bold">No OpenIndiana environments</span></property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
--- a/usr/src/cmd/gui-install/src/failure-screen.c Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/failure-screen.c Tue Aug 16 20:54:07 2011 +0000
@@ -177,17 +177,17 @@
switch (InstallationProfile.installationtype) {
case INSTALLATION_TYPE_INITIAL_INSTALL:
labelstr = g_strdup_printf(labelmarkup,
- _("Oracle Solaris installation did not complete normally."));
+ _("OpenIndiana installation did not complete normally."));
buttonstr = g_strdup_printf(buttonmarkup,
- _("Oracle Solaris installation log"));
+ _("OpenIndiana installation log"));
break;
case INSTALLATION_TYPE_INPLACE_UPGRADE:
labelstr = g_strdup_printf(labelmarkup,
- _("Oracle Solaris Developer Preview 2 upgrade did not complete normally. "
+ _("OpenIndiana Developer Preview 2 upgrade did not complete normally. "
"The system has been restored to its previous state."));
buttonstr = g_strdup_printf(buttonmarkup,
- _("Oracle Solaris upgrade log"));
+ _("OpenIndiana upgrade log"));
break;
}
gtk_label_set_label(GTK_LABEL(
--- a/usr/src/cmd/gui-install/src/failure.glade Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/failure.glade Tue Aug 16 20:54:07 2011 +0000
@@ -45,7 +45,7 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><span>For more information, you can review the Oracle Solaris installation log.</span></property>
+ <property name="label" translatable="yes"><span>For more information, you can review the OpenIndiana installation log.</span></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="width_chars">70</property>
@@ -74,7 +74,7 @@
<widget class="GtkLabel" id="logbuttonlabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><span foreground="#5582a3">Oracle Solaris installation log</span></property>
+ <property name="label" translatable="yes"><span foreground="#5582a3">OpenIndiana installation log</span></property>
<property name="use_markup">True</property>
</widget>
</child>
@@ -101,7 +101,7 @@
<widget class="GtkLabel" id="failureinfolabel">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><span font_desc="Bold">Oracle Solaris installation did not complete normally.</span></property>
+ <property name="label" translatable="yes"><span font_desc="Bold">OpenIndiana installation did not complete normally.</span></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="width_chars">70</property>
--- a/usr/src/cmd/gui-install/src/finish-screen.c Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/finish-screen.c Tue Aug 16 20:54:07 2011 +0000
@@ -170,18 +170,18 @@
switch (InstallationProfile.installationtype) {
case INSTALLATION_TYPE_INITIAL_INSTALL:
labelstr = g_strdup_printf(labelmarkup,
- _("Oracle Solaris installation is complete. Review the "
- "Oracle Solaris installation log for more information"));
+ _("OpenIndiana installation is complete. Review the "
+ "OpenIndiana installation log for more information"));
buttonstr = g_strdup_printf(buttonmarkup,
- _("Oracle Solaris installation log"));
+ _("OpenIndiana installation log"));
break;
case INSTALLATION_TYPE_INPLACE_UPGRADE:
labelstr = g_strdup_printf(labelmarkup,
- _("Oracle Solaris upgrade is complete. Review the "
- "Oracle Solaris upgrade log for more information"));
+ _("OpenIndiana upgrade is complete. Review the "
+ "OpenIndiana upgrade log for more information"));
buttonstr = g_strdup_printf(buttonmarkup,
- _("Oracle Solaris upgrade log"));
+ _("OpenIndiana upgrade log"));
break;
}
gtk_label_set_label(GTK_LABEL(
--- a/usr/src/cmd/gui-install/src/gui-install.glade Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/gui-install.glade Tue Aug 16 20:54:07 2011 +0000
@@ -27,7 +27,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="mainwindow">
<property name="border_width">12</property>
- <property name="title" translatable="yes">Oracle Solaris Installer</property>
+ <property name="title" translatable="yes">OpenIndiana Installer</property>
<child>
<widget class="GtkTable" id="mainwindowtable">
<property name="visible">True</property>
@@ -96,7 +96,7 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><span font_desc="Bold">Oracle Solaris</span></property>
+ <property name="label" translatable="yes"><span font_desc="Bold">OpenIndiana</span></property>
<property name="use_markup">True</property>
<property name="ellipsize">end</property>
<accessibility>
@@ -702,7 +702,7 @@
<widget class="GtkLabel" id="welcomesummarylabel">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Thanks for choosing to install the Oracle Solaris OS! Before you start, review the Release Notes for this release for a list of known problems. For detailed step-by-step procedures for completing this installation, select the Getting Started With Oracle Solaris icon on the Live CD desktop.</property>
+ <property name="label" translatable="yes">Thanks for choosing to install the OpenIndiana OS! Before you start, review the Release Notes for this release for a list of known problems. For detailed step-by-step procedures for completing this installation, select the Getting Started With OpenIndiana icon on the Live CD desktop.</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
@@ -720,7 +720,7 @@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">This installer will not upgrade existing installations of Oracle Solaris. If you would like to upgrade an existing installation, select the Getting Started With Oracle Solaris icon on the Live CD desktop, and review the upgrade instructions in that document.</property>
+ <property name="label" translatable="yes">This installer will not upgrade existing installations of OpenIndiana. If you would like to upgrade an existing installation, select the Getting Started With OpenIndiana icon on the Live CD desktop, and review the upgrade instructions in that document.</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
<property name="width_chars">80</property>
@@ -818,7 +818,7 @@
<widget class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><span font_desc="Bold">Finding Oracle Solaris Environments</span></property>
+ <property name="label" translatable="yes"><span font_desc="Bold">Finding OpenIndiana Environments</span></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -1016,7 +1016,7 @@
</child>
</widget>
<widget class="GtkDialog" id="helpdialog">
- <property name="title" translatable="yes">Oracle Solaris Help</property>
+ <property name="title" translatable="yes">OpenIndiana Help</property>
<property name="window_position">center</property>
<property name="default_width">750</property>
<property name="default_height">450</property>
@@ -1096,7 +1096,7 @@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><span font_desc="Bold">Oracle Solaris installation is complete. Review the Oracle Solaris installation log for more information.</span></property>
+ <property name="label" translatable="yes"><span font_desc="Bold">OpenIndiana installation is complete. Review the OpenIndiana installation log for more information.</span></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
@@ -1125,7 +1125,7 @@
<widget class="GtkLabel" id="logbuttonlabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><span foreground="#5582a3">Oracle Solaris installation log</span></property>
+ <property name="label" translatable="yes"><span foreground="#5582a3">OpenIndiana installation log</span></property>
<property name="use_markup">True</property>
</widget>
</child>
@@ -1225,7 +1225,7 @@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><span font_desc="Bold">Checking for sufficient free space on the Oracle Solaris environment to perform Oracle Solaris upgrade.</span></property>
+ <property name="label" translatable="yes"><span font_desc="Bold">Checking for sufficient free space on the OpenIndiana environment to perform OpenIndiana upgrade.</span></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</widget>
--- a/usr/src/cmd/gui-install/src/installation-disk-screen.c Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/installation-disk-screen.c Tue Aug 16 20:54:07 2011 +0000
@@ -5819,7 +5819,7 @@
/* 1. No disk selected */
if (activedisk < 0) {
errorprimarytext = g_strdup(
- _("No disk has been selected for Oracle Solaris installation."));
+ _("No disk has been selected for OpenIndiana installation."));
errorsecondarytext =
g_strdup(_("Select a disk."));
goto errors;
@@ -5830,7 +5830,7 @@
diskcapacity = orchestrator_om_get_disk_sizemb(alldiskinfo[activedisk]);
if (diskcapacity < orchestrator_om_get_mininstall_sizemb()) {
errorprimarytext = g_strdup(
- _("The selected disk is not suitable for Oracle Solaris installation."));
+ _("The selected disk is not suitable for OpenIndiana installation."));
errorsecondarytext =
g_strdup(_("Select another disk."));
goto errors;
@@ -5915,7 +5915,7 @@
orchestrator_om_get_mininstall_sizegb(FALSE)) {
errorprimarytext =
g_strdup(_("The Solaris partition is too "
- "small for Solaris installation."));
+ "small for installation."));
errorsecondarytext =
g_strdup(_("Increase the size of the Solaris partition."));
}
@@ -6062,7 +6062,7 @@
errorprimarytext =
g_strdup(_("Unsupported partitioning configuration."));
errorsecondarytext =
- g_strdup(_("Oracle Solaris does not support changing the "
+ g_strdup(_("OpenIndiana does not support changing the "
"partition type when two or more of that "
"type exist on the disk. Please Quit the "
"installer, run fdisk in the terminal window "
--- a/usr/src/cmd/gui-install/src/installation-screen.c Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/installation-screen.c Tue Aug 16 20:54:07 2011 +0000
@@ -217,11 +217,11 @@
switch (InstallationProfile.installationtype) {
case INSTALLATION_TYPE_INITIAL_INSTALL:
MainWindow.InstallationWindow.current_install_message =
- g_strdup("Preparing for Oracle Solaris installation");
+ g_strdup("Preparing for OpenIndiana installation");
break;
case INSTALLATION_TYPE_INPLACE_UPGRADE:
MainWindow.InstallationWindow.current_install_message =
- g_strdup("Preparing for Oracle Solaris upgrade");
+ g_strdup("Preparing for OpenIndiana upgrade");
break;
}
@@ -650,7 +650,7 @@
switch (cb_data->curr_milestone) {
case OM_TARGET_INSTANTIATION :
MainWindow.InstallationWindow.current_install_message =
- g_strdup(_("Preparing disk for Oracle Solaris installation"));
+ g_strdup(_("Preparing disk for OpenIndiana installation"));
/*
* Wild, random, guess that target instantiation accounts
* for approx. 5% of total installation time
@@ -731,7 +731,7 @@
case OM_SOFTWARE_UPDATE :
MainWindow.InstallationWindow.current_install_message =
- g_strdup(_("Updating Oracle Solaris software"));
+ g_strdup(_("Updating OpenIndiana software"));
/*
* And software update takes 89%
*/
--- a/usr/src/cmd/gui-install/src/installationdisk.glade Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/installationdisk.glade Tue Aug 16 20:54:07 2011 +0000
@@ -333,7 +333,7 @@
<child>
<widget class="GtkLabel" id="partitioningchoicelabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span font_desc="Bold">Oracle Solaris can be installed on the whole disk or on a partition on the disk.</span></property>
+ <property name="label" translatable="yes"><span font_desc="Bold">OpenIndiana can be installed on the whole disk or on a partition on the disk.</span></property>
<property name="use_markup">True</property>
</widget>
<packing>
--- a/usr/src/cmd/gui-install/src/main.c Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/main.c Tue Aug 16 20:54:07 2011 +0000
@@ -97,10 +97,10 @@
MainWindow.ScreenSubTitles = g_new0(gchar*, NUMSCREENS);
MainWindow.ScreenSubTitles[WELCOME_SCREEN] =
g_strdup_printf(ScreenSubTitleMarkup,
- _("Oracle Solaris"));
+ _("OpenIndiana"));
MainWindow.ScreenSubTitles[DISK_SCREEN] =
g_strdup_printf(ScreenSubTitleMarkup,
- _("Where should Oracle Solaris be installed?"));
+ _("Where should OpenIndiana be installed?"));
MainWindow.ScreenSubTitles[TIMEZONE_SCREEN] =
g_strdup_printf(ScreenSubTitleMarkup,
_("Select a city near you on the map or set your time zone below,then set the date and time."));
@@ -559,7 +559,7 @@
GNOME_PARAM_NONE);
if (getuid() != 0) {
- g_warning("The Oracle Solaris installer must be run as root. Quitting.");
+ g_warning("The OpenIndiana installer must be run as root. Quitting.");
exit(-1);
}
--- a/usr/src/cmd/gui-install/src/upgrade-screen.c Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/upgrade-screen.c Tue Aug 16 20:54:07 2011 +0000
@@ -90,7 +90,7 @@
GTK_MESSAGE_ERROR,
_("Upgrade target validation failed"),
_("The installer encountered an internal error validating "
- "the selected Oracle Solaris environment. It can not be upgraded."));
+ "the selected OpenIndiana environment. It can not be upgraded."));
disable_upgrade_target(uinfo,
_("Upgrade target validation error."));
om_free_upgrade_targets(omhandle, uinfo);
@@ -547,7 +547,7 @@
GTK_MESSAGE_ERROR,
_("Free space checking failed"),
_("There is insufficient free space to upgrade "
- "the selected Oracle Solaris environment."));
+ "the selected OpenIndiana environment."));
disk_button_get_upgrade_info(&dinfo, &uinfo);
disable_upgrade_target(uinfo,
_("Insufficient free space."));
--- a/usr/src/cmd/gui-install/src/users-screen.c Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/users-screen.c Tue Aug 16 20:54:07 2011 +0000
@@ -584,7 +584,7 @@
if (host_name_empty) {
gtk_entry_set_text(
GTK_ENTRY(MainWindow.UsersWindow.hostnameentry),
- "solaris");
+ "openindiana");
ret_val = gui_install_prompt_dialog(
TRUE,
TRUE,
@@ -777,7 +777,7 @@
if (is_str_empty(hostname)) {
gtk_entry_set_text(
GTK_ENTRY(MainWindow.UsersWindow.hostnameentry),
- "solaris");
+ "openindiana");
}
gtk_widget_grab_focus(
MainWindow.UsersWindow.hostnameentry);
--- a/usr/src/cmd/gui-install/src/users.glade Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/gui-install/src/users.glade Tue Aug 16 20:54:07 2011 +0000
@@ -326,7 +326,7 @@
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="width_chars">14</property>
- <property name="text" translatable="yes">solaris</property>
+ <property name="text" translatable="yes">openindiana</property>
<signal name="changed" handler="on_users_entry_changed"/>
<signal name="focus_out_event" handler="on_hostname_focus_out_event"/>
<signal name="focus_in_event" handler="on_userentry_focus_in_event"/>
--- a/usr/src/cmd/installadm/ai-httpd.conf Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/installadm/ai-httpd.conf Tue Aug 16 20:54:07 2011 +0000
@@ -6,7 +6,7 @@
# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
# for a discussion of each configuration directive.
#
-# Solaris Quick Configuration Information
+# OpenIndiana Quick Configuration Information
#
# 1. Set ServerName if necessary (default is 127.0.0.1)
# 2. Set ServerAdmin to a valid email address
--- a/usr/src/cmd/installadm/create_client.py Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/installadm/create_client.py Tue Aug 16 20:54:07 2011 +0000
@@ -63,7 +63,7 @@
"[-t <imagepath>]"))
# accept multiple -b options (so append to a list)
parser.add_option("-b", dest="boot_args", action="append", type="string",
- nargs=1, help=_("boot arguments to pass Solaris kernel"))
+ nargs=1, help=_("boot arguments to pass kernel"))
parser.add_option("-e", dest="mac_address", action="callback", nargs=1,
type="string", help=_("MAC address of client to add"),
callback=check_MAC_address)
--- a/usr/src/cmd/installadm/installadm-common.sh Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/installadm/installadm-common.sh Tue Aug 16 20:54:07 2011 +0000
@@ -38,7 +38,7 @@
SED=/usr/bin/sed
SVCCFG=/usr/sbin/svccfg
-DEFAULT_GRUB_TITLE="Oracle Solaris"
+DEFAULT_GRUB_TITLE="OpenIndiana"
VERSION="Solaris"
HTTP_PORT=5555
@@ -253,7 +253,7 @@
elif [ -d ${image_path}/platform/i86pc ]; then
image_type="${X86_IMAGE}"
else
- echo "Unable to determine Oracle Solaris install image type"
+ echo "Unable to determine OpenIndiana install image type"
exit 1
fi
echo "$image_type"
--- a/usr/src/cmd/installadm/installadm.h Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/installadm/installadm.h Tue Aug 16 20:54:07 2011 +0000
@@ -157,7 +157,7 @@
#define MSG_CREATE_IMAGE_ERR INSTALLADMSTR(\
"Create image failed.\n")
#define MSG_UNABLE_TO_DETERMINE_ARCH INSTALLADMSTR(\
- "Unable to determine Oracle Solaris install image type.\n")
+ "Unable to determine OpenIndiana install image type.\n")
#define MSG_REGISTER_SERVICE_FAIL INSTALLADMSTR(\
"Failed to register Install Service %s.\n")
#define MSG_LIST_SERVICE_FAIL INSTALLADMSTR(\
--- a/usr/src/cmd/installadm/setup-dhcp.sh Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/installadm/setup-dhcp.sh Tue Aug 16 20:54:07 2011 +0000
@@ -107,12 +107,12 @@
echo " Boot server IP (BootSrvA) : ${svr_ipaddr}"
echo " Boot file (BootFile) : ${bootfile}"
- echo "If you are running Oracle Solaris DHCP Server, use the"
+ echo "If you are running OpenIndiana DHCP Server, use the"
echo "following command to add the DHCP macro, ${macro}:"
echo " $DHTADM -A -m ${macro} -d ${macvalue}"
echo ""
echo "Note: Be sure to assign client IP address(es) if needed"
- echo "(e.g., for Oracle Solaris DHCP Server, run pntadm(1M))."
+ echo "(e.g., for OpenIndiana DHCP Server, run pntadm(1M))."
}