--- a/usr/src/cmd/distro_const/DC-manifest.defval.xml Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/DC-manifest.defval.xml Tue Aug 16 20:54:07 2011 +0000
@@ -119,25 +119,25 @@
<default nodepath=
"img_params/pkg_repo_default_authority/main/url"
from="value" type="attribute" missing_parent="create" skip_if_no_exist="img_params">
- http://pkg.opensolaris.org/release
+ http://pkg.openindiana.org/stable
</default>
<default nodepath=
"img_params/pkg_repo_default_authority/main/authname"
from="value" type="attribute" missing_parent="create" skip_if_no_exist="img_params">
- opensolaris.org
+ openindiana.org
</default>
<default nodepath=
"img_params/post_install_repo_default_authority/main/url"
from="value" type="attribute" missing_parent="create" skip_if_no_exist="img_params">
- http://pkg.opensolaris.org/release
+ http://pkg.openindiana.org/stable
</default>
<default nodepath=
"img_params/post_install_repo_default_authority/main/authname"
from="value" type="attribute" missing_parent="create" skip_if_no_exist="img_params">
- opensolaris.org
+ openindiana.org
</default>
<default nodepath=
@@ -149,7 +149,7 @@
<default nodepath=
"img_params/rootpass"
from="value" type="element" missing_parent="create" skip_if_no_exist="img_params">
- solaris
+ openindiana
</default>
<default nodepath=
@@ -284,7 +284,7 @@
<default nodepath= "img_params/hostname"
from="value" type="element" skip_if_no_exist="img_params">
- solaris
+ openindiana
</default>
<default nodepath="img_params/grub_menu_modifications/min_mem64"
--- a/usr/src/cmd/distro_const/DC-manifest.rng Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/DC-manifest.rng Tue Aug 16 20:54:07 2011 +0000
@@ -273,7 +273,7 @@
started at boottime. Note: Use one of
/var/svc/profile/generic_limited_net.xml or
/var/svc/profile/generic_open.xml which define the
- two configurations delivered with Solaris, or use
+ two configurations delivered with OpenIndiana, or use
your own. -->
<optional> <!-- generic_limited_net.xml if not spec -->
<element name="netservices_SMF_profile">
--- a/usr/src/cmd/distro_const/auto_install/ai_sparc_image.xml Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/auto_install/ai_sparc_image.xml Tue Aug 16 20:54:07 2011 +0000
@@ -20,10 +20,10 @@
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- XML specification for building an Oracle Solaris installer iso image
+ XML specification for building an OpenIndiana installer iso image
-->
-<distribution name="Oracle_Solaris_AI_SPARC">
+<distribution name="OpenIndiana_AI_SPARC">
<distro_constr_params>
<!--
Where to build. This can be a zfs dataset or a mountpoint.
@@ -191,13 +191,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
@@ -226,15 +226,15 @@
<!--
The default preferred authority to be used by the system
after it has been installed.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
-->
<post_install_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
Uncomment before using.
<mirror url="" />
@@ -259,7 +259,7 @@
<!--
Password for the root user/role in the image.
- If not specified, the default value of "solaris"
+ If not specified, the default value of "openindiana"
will be used
-->
<!--
--- a/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml Tue Aug 16 20:54:07 2011 +0000
@@ -20,10 +20,10 @@
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- XML specification for building an Oracle Solaris installer iso image
+ XML specification for building an OpenIndiana installer iso image
-->
-<distribution name="Oracle_Solaris_AI_X86">
+<distribution name="OpenIndiana_AI_X86">
<distro_constr_params>
<!--
Where to build. This can be a zfs dataset or a mountpoint.
@@ -206,13 +206,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
@@ -241,15 +241,15 @@
<!--
The default preferred authority to be used by the system
after it has been installed.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
-->
<post_install_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
Uncomment before using.
<mirror url="" />
@@ -274,7 +274,7 @@
<!--
Password for the root user/role in the image.
- If not specified, the default value of "solaris"
+ If not specified, the default value of "openindiana"
will be used
-->
<!--
--- a/usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd_x86.xml Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd_x86.xml Tue Aug 16 20:54:07 2011 +0000
@@ -20,11 +20,11 @@
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- XML specification for building the all languages Oracle Solaris
+ XML specification for building the all languages OpenIndiana
live CD iso and usb image
-->
-<distribution name="Oracle_Solaris_Live_X86">
+<distribution name="OpenIndiana_Live_X86">
<distro_constr_params>
<!--
Where to build. This can be a zfs dataset or a mountpoint.
@@ -191,13 +191,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
@@ -226,15 +226,15 @@
<!--
The default preferred authority to be used by the system
after it has been installed.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
-->
<post_install_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
Uncomment before using.
<mirror url="" />
@@ -258,7 +258,7 @@
-->
<!--
Password for the root user/role in the image.
- If not specified, the default value of "solaris"
+ If not specified, the default value of "openindiana"
will be used
-->
<!--
--- a/usr/src/cmd/distro_const/slim_cd/slim_cd_x86.xml Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/slim_cd/slim_cd_x86.xml Tue Aug 16 20:54:07 2011 +0000
@@ -20,11 +20,11 @@
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- XML specification for building the limited language Oracle Solaris
+ XML specification for building the limited language OpenIndiana
live CD iso and usb image
-->
-<distribution name="Oracle_Solaris_Live_X86">
+<distribution name="OpenIndiana_Live_X86">
<distro_constr_params>
<!--
Where to build. This can be a zfs dataset or a mountpoint.
@@ -190,13 +190,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
@@ -225,15 +225,15 @@
<!--
The default preferred authority to be used by the system
after it has been installed.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
-->
<post_install_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
Uncomment before using.
<mirror url="" />
@@ -257,7 +257,7 @@
-->
<!--
Password for the root user/role in the image.
- If not specified, the default value of "solaris"
+ If not specified, the default value of "openindiana"
will be used
-->
<!--
--- a/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml Tue Aug 16 20:54:07 2011 +0000
@@ -20,11 +20,11 @@
Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- XML specification for building the limited language Oracle Solaris
+ XML specification for building the limited language OpenIndiana
Text Mode Installer iso and usb image
-->
-<distribution name="Oracle_Solaris_Text_SPARC">
+<distribution name="OpenIndiana_Text_SPARC">
<distro_constr_params>
<!--
Where to build. This can be a zfs dataset or a mountpoint.
@@ -173,13 +173,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
@@ -208,15 +208,15 @@
<!--
The default preferred authority to be used by the system
after it has been installed.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
-->
<post_install_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
Uncomment before using.
<mirror url="" />
--- a/usr/src/cmd/distro_const/text_install/text_mode_x86.xml Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/text_install/text_mode_x86.xml Tue Aug 16 20:54:07 2011 +0000
@@ -20,11 +20,11 @@
Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- XML specification for building the limited language Oracle Solaris
+ XML specification for building the limited language OpenIndiana
Text Mode Installer iso and usb image
-->
-<distribution name="Oracle_Solaris_Text_X86">
+<distribution name="OpenIndiana_Text_X86">
<distro_constr_params>
<!--
Where to build. This can be a zfs dataset or a mountpoint.
@@ -187,13 +187,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
@@ -222,15 +222,15 @@
<!--
The default preferred authority to be used by the system
after it has been installed.
- The default url is: http://pkg.oracle.com/solaris/release
- The default authname is solaris
+ The default url is: http://pkg.openindiana.org/stable
+ The default authname is openindiana.org
If you want to use one or more mirrors that are
setup for the authority, specify the urls here.
-->
<post_install_repo_default_authority>
<main
- url="http://pkg.oracle.com/solaris/release"
- authname="solaris"/>
+ url="http://pkg.openindiana.org/stable"
+ authname="openindiana.org"/>
<!--
Uncomment before using.
<mirror url="" />
--- a/usr/src/cmd/distro_const/utils/boot_archive_configure Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/utils/boot_archive_configure Tue Aug 16 20:54:07 2011 +0000
@@ -177,7 +177,7 @@
VOLSETID_FILENAME=.volsetid
# hostname name for the image
-HOSTNAME="solaris"
+HOSTNAME="openindiana"
print "Configuring boot archive..."
--- a/usr/src/cmd/distro_const/vmc/create_vm Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/vmc/create_vm Tue Aug 16 20:54:07 2011 +0000
@@ -254,9 +254,9 @@
exit 1
fi
-if [[ "${OSTYPE}" != "opensolaris" && "${OSTYPE}" != "opensolaris_64" ]]; then
+if [[ "${OSTYPE}" != "openindiana" && "${OSTYPE}" != "openindiana_64" ]]; then
print -u2 "\nThe OS Type specified: ${OSTYPE} is invalid." \
- "It must be either \"opensolaris\" or \"opensolaris_64\" "
+ "It must be either \"openindiana\" or \"openindiana_64\" "
exit 1
fi
--- a/usr/src/cmd/distro_const/vmc/prepare_ai_image Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/vmc/prepare_ai_image Tue Aug 16 20:54:07 2011 +0000
@@ -294,7 +294,7 @@
print "timeout=5" >> ${TMP_ISO}/boot/grub/menu.lst
print "${min_mem64}" >> ${TMP_ISO}/boot/grub/menu.lst
- print "\ntitle Oracle Solaris Development Virtual Machine Constructor" \
+ print "\ntitle OpenIndiana Development Virtual Machine Constructor" \
"Automated Install" >> ${TMP_ISO}/boot/grub/menu.lst
print "\tkernel$ /platform/i86pc/kernel/\$ISADIR/unix" \
"-B install=true -B auto-shutdown=enable" \
--- a/usr/src/cmd/distro_const/vmc/vmc_image.xml Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/distro_const/vmc/vmc_image.xml Tue Aug 16 20:54:07 2011 +0000
@@ -23,7 +23,7 @@
XML specification for building a Virtual Machine image
-->
-<distribution name="Solaris_VMC">
+<distribution name="OpenIndiana_VMC">
<distro_constr_params>
<!--
Where to build. This can be a zfs dataset or a mountpoint.
@@ -107,12 +107,12 @@
"1536"
<!--
virtual machine type
- valid values are opensolaris
+ valid values are openindiana
for a 32-bit vm or
- opensolaris_64 for a 64-bit
+ openindiana_64 for a 64-bit
vm
-->
- "opensolaris"
+ "openindiana"
</argslist>
</script>
<script name="/usr/share/distro_const/vmc/install_vm">