6989410 slim_cd manifests should list system/install/gui-install explicitly
6991542 DC manifests need to be updated with new publisher, origin
6991545 DC show not require <post_install_repo_default_authority> be up & running
--- a/usr/src/cmd/distro_const/auto_install/ai_sparc_image.xml Fri Oct 15 09:17:57 2010 -0700
+++ b/usr/src/cmd/distro_const/auto_install/ai_sparc_image.xml Fri Oct 15 13:42:56 2010 -0600
@@ -191,13 +191,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
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.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
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.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
Uncomment before using.
<mirror url="" />
@@ -281,6 +281,7 @@
<pkg name="pkg:/[email protected]#/>
-->
<pkg name="pkg:/entire"/>
+ <pkg name="pkg:/system/install/media/internal"/>
<pkg name="pkg:/auto_install"/>
</packages>
<!--
--- a/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml Fri Oct 15 09:17:57 2010 -0700
+++ b/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml Fri Oct 15 13:42:56 2010 -0600
@@ -206,13 +206,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
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.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
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.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
Uncomment before using.
<mirror url="" />
@@ -296,6 +296,7 @@
<pkg name="pkg:/[email protected]#/>
-->
<pkg name="pkg:/entire"/>
+ <pkg name="pkg:/system/install/media/internal"/>
<pkg name="pkg:/auto_install"/>
</packages>
<!--
--- a/usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd_x86.xml Fri Oct 15 09:17:57 2010 -0700
+++ b/usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd_x86.xml Fri Oct 15 13:42:56 2010 -0600
@@ -191,13 +191,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
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.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
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.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
Uncomment before using.
<mirror url="" />
@@ -280,6 +280,7 @@
-->
<pkg name="pkg:/entire"/>
<pkg name="pkg:/babel_install"/>
+ <pkg name="pkg:/system/install/gui-install"/>
<pkg name="pkg:/system/install/media/internal"/>
</packages>
<!--
--- a/usr/src/cmd/distro_const/slim_cd/slim_cd_x86.xml Fri Oct 15 09:17:57 2010 -0700
+++ b/usr/src/cmd/distro_const/slim_cd/slim_cd_x86.xml Fri Oct 15 13:42:56 2010 -0600
@@ -190,13 +190,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
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.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
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.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
Uncomment before using.
<mirror url="" />
@@ -280,6 +280,7 @@
-->
<pkg name="pkg:/entire"/>
<pkg name="pkg:/slim_install"/>
+ <pkg name="pkg:/system/install/gui-install"/>
<pkg name="pkg:/system/install/media/internal"/>
</packages>
<!--
--- a/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml Fri Oct 15 09:17:57 2010 -0700
+++ b/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml Fri Oct 15 13:42:56 2010 -0600
@@ -173,13 +173,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
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.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
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.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
Uncomment before using.
<mirror url="" />
--- a/usr/src/cmd/distro_const/text_install/text_mode_x86.xml Fri Oct 15 09:17:57 2010 -0700
+++ b/usr/src/cmd/distro_const/text_install/text_mode_x86.xml Fri Oct 15 13:42:56 2010 -0600
@@ -187,13 +187,13 @@
<!--
The preferred authority to install packages into the
pkg_image area from.
- The default url is: http://pkg.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
-->
<pkg_repo_default_authority>
<main
- url="http://pkg.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
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.opensolaris.org/release
- The default authname is opensolaris.org
+ The default url is: http://pkg.oracle.com/solaris/release
+ The default authname is solaris
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.opensolaris.org/release"
- authname="opensolaris.org"/>
+ url="http://pkg.oracle.com/solaris/release"
+ authname="solaris"/>
<!--
Uncomment before using.
<mirror url="" />
--- a/usr/src/cmd/distro_const/utils/im_pop.py Fri Oct 15 09:17:57 2010 -0700
+++ b/usr/src/cmd/distro_const/utils/im_pop.py Fri Oct 15 13:42:56 2010 -0600
@@ -451,7 +451,7 @@
print >> sys.stderr, "Setting alternate publisher: " + alt_auth
print >> sys.stderr, "\tOrigin repository: " + alt_url
STATUS = ips_set_auth(alt_url, alt_auth, PKG_IMG_MNT_PT,
- refresh_flag=True)
+ refresh_flag=False)
if STATUS != TM_E_SUCCESS:
print >> sys.stderr, "Unable to set alternate publisher " + \
"for IPS image"
@@ -596,13 +596,6 @@
# want that to be polluted.
VALIDATE_MNTPT = TMP_DIR + "/validate_mntpt"
- STATUS = ips_validate_auth(FUTURE_URL, FUTURE_AUTH,
- VALIDATE_MNTPT, pref_flag=True)
- if STATUS != TM_E_SUCCESS:
- dcu.cleanup_dir(VALIDATE_MNTPT)
- raise Exception, (sys.argv[0] + ": Post-install publisher or " +
- "URL is not valid")
-
STATUS = ips_set_auth(FUTURE_URL, FUTURE_AUTH, PKG_IMG_MNT_PT,
pref_flag=True)
if STATUS != TM_E_SUCCESS:
@@ -628,13 +621,7 @@
POST_INSTALL_DEFAULT_MIRROR_URL)
for future_url in FUTURE_MIRROR_URL_LIST:
print >> sys.stderr, "\tMirror repository: " + future_url
- STATUS = ips_validate_auth(future_url, FUTURE_AUTH,
- VALIDATE_MNTPT,
- mirr_cmd=TM_IPS_SET_MIRROR)
- if STATUS != TM_E_SUCCESS:
- dcu.cleanup_dir(VALIDATE_MNTPT)
- raise Exception, (sys.argv[0] + ": Post-install mirror " +
- "repository is not valid")
+
STATUS = ips_set_auth(future_url, FUTURE_AUTH, PKG_IMG_MNT_PT,
mirr_cmd=TM_IPS_SET_MIRROR)
if STATUS != TM_E_SUCCESS:
@@ -655,12 +642,7 @@
print >> sys.stderr, "Setting post-install alternate publisher: " + \
future_alt_auth
print >> sys.stderr, "\tOrigin repository: " + future_alt_url
- STATUS = ips_validate_auth(future_alt_url, future_alt_auth,
- VALIDATE_MNTPT)
- if STATUS != TM_E_SUCCESS:
- dcu.cleanup_dir(VALIDATE_MNTPT)
- raise Exception, (sys.argv[0] + ": Post-install alternate " +
- "publisher or URL is not valid")
+
STATUS = ips_set_auth(future_alt_url, future_alt_auth, PKG_IMG_MNT_PT)
if STATUS != TM_E_SUCCESS:
if QUIT_ON_PKG_FAILURE == 'true':
@@ -683,13 +665,7 @@
for future_add_mirror_url in future_add_mirror_url_list:
print >> sys.stderr, "\tMirror repository: " + \
future_add_mirror_url
- STATUS = ips_validate_auth(future_add_mirror_url,
- future_alt_auth, VALIDATE_MNTPT,
- mirr_cmd=TM_IPS_SET_MIRROR)
- if STATUS != TM_E_SUCCESS:
- dcu.cleanup_dir(VALIDATE_MNTPT)
- raise Exception, (sys.argv[0] + ": Post-install alternate " +
- "mirror is not valid")
+
STATUS = ips_set_auth(future_add_mirror_url,
future_alt_auth,
PKG_IMG_MNT_PT,
--- a/usr/src/cmd/slim-install/finish/install-finish Fri Oct 15 09:17:57 2010 -0700
+++ b/usr/src/cmd/slim-install/finish/install-finish Fri Oct 15 13:42:56 2010 -0600
@@ -250,7 +250,8 @@
else:
# GUI installer
PKG_REMOVE_LIST = ['pkg:/system/install/media/internal',
- 'pkg:/system/install/gui-install']
+ 'pkg:/system/install/gui-install',
+ 'pkg:/system/install/locale']
if NO_NETWORK:
SA.append(ICTO.do_not_configure_network())
else: