14681 /contrib needs some alone time slim_1003 Build134
authorJoseph J Vlcek <Joseph.Vlcek@Sun.COM>
Tue, 23 Feb 2010 11:59:38 -0700
branchslim_1003
changeset 753 e04cf9540cab
parent 750 75175c5b8c1c
child 756 f3f57a345986
14681 /contrib needs some alone time
usr/src/cmd/auto-install/ai_manifest.xml
usr/src/cmd/auto-install/default.xml
usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd_x86.xml
usr/src/cmd/distro_const/slim_cd/slim_cd_x86.xml
--- a/usr/src/cmd/auto-install/ai_manifest.xml	Mon Feb 22 13:32:55 2010 -0800
+++ b/usr/src/cmd/auto-install/ai_manifest.xml	Tue Feb 23 11:59:38 2010 -0700
@@ -145,10 +145,6 @@
 		<main url="http://pkg.opensolaris.org/release" publisher="opensolaris.org"/>
 		<mirror url=""/>
 	</ai_pkg_repo_default_publisher>
-	<ai_pkg_repo_addl_publisher>
-		<main url="http://pkg.opensolaris.org/contrib" publisher="contrib.opensolaris.org"/>
-		<mirror url=""/>
-	</ai_pkg_repo_addl_publisher>
 
 	<!--
 	    By default the latest build available, in the
--- a/usr/src/cmd/auto-install/default.xml	Mon Feb 22 13:32:55 2010 -0800
+++ b/usr/src/cmd/auto-install/default.xml	Tue Feb 23 11:59:38 2010 -0700
@@ -29,10 +29,6 @@
                 <main url="http://pkg.opensolaris.org/release" publisher="opensolaris.org"/>
                 <mirror url=""/>
             </ai_pkg_repo_default_publisher>
-            <ai_pkg_repo_addl_publisher>
-                <main url="http://pkg.opensolaris.org/contrib" publisher="contrib.opensolaris.org"/>
-                <mirror url=""/>
-            </ai_pkg_repo_addl_publisher>
 
             <!--
                 By default the latest build available, in the specified IPS
--- a/usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd_x86.xml	Mon Feb 22 13:32:55 2010 -0800
+++ b/usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd_x86.xml	Tue Feb 23 11:59:38 2010 -0700
@@ -244,36 +244,15 @@
 		     If you want to use one or more  mirrors that are
 		     setup for the authority, specify the urls here.
 		-->
-
+		<!--
+		     Uncomment before using.
 		<post_install_repo_addl_authority>
 			<main
-				url="http://pkg.opensolaris.org/contrib"
-				authname="contrib.opensolaris.org"/>
-			<!--
-			     If you want to use one or more  mirrors that are
-			     setup for the authority, specify the urls here.
-			-->
-			<!--
-			     Uncomment before using.
-			<mirror url="" />
-			-->
-
-			<!--
-			     Additional non-preferred authorities used when
-			     running the live image and after the system has
-			     been installed. If you want to use one or more
-			     mirrors that are setup for the authority, specify
-			     the urls here.
-			-->
-			<!--
-			     Uncomment before using.
-			<main
 				url=""
 				authname=""/>
 			<mirror url="" />
-			-->
 		</post_install_repo_addl_authority>
-
+		-->
 		<!--
 		     Password for the root user/role in the image.
                      If not specified, the default value of "opensolaris"
--- a/usr/src/cmd/distro_const/slim_cd/slim_cd_x86.xml	Mon Feb 22 13:32:55 2010 -0800
+++ b/usr/src/cmd/distro_const/slim_cd/slim_cd_x86.xml	Tue Feb 23 11:59:38 2010 -0700
@@ -243,35 +243,15 @@
 		     If you want to use one or more  mirrors that are
 		     setup for the authority, specify the urls here.
 		-->
-
+		<!--
+		     Uncomment before using.
 		<post_install_repo_addl_authority>
 			<main
-				url="http://pkg.opensolaris.org/contrib"
-				authname="contrib.opensolaris.org"/>
-			<!--
-			     If you want to use one or more  mirrors that are
-			     setup for the authority, specify the urls here.
-			-->
-			<!--
-			     Uncomment before using.
-			<mirror url="" />
-			-->
-
-			<!--
-			     Additional non-preferred authorities used when
-			     running the live image and after the system has
-			     been installed. If you want to use one or more
-			     mirrors that are setup for the authority, specify
-			     the urls here.
-			-->
-			<!--
-			     Uncomment before using.
-			<main
 				url=""
 				authname=""/>
 			<mirror url="" />
-			-->
 		</post_install_repo_addl_authority>
+		-->
 		<!--
 		     Password for the root user/role in the image.
                      If not specified, the default value of "opensolaris"