6991543 AI manifests need to be updated with new publisher, origin
authorEthan Quach <Ethan.Quach@sun.com>
Fri, 15 Oct 2010 09:17:57 -0700
changeset 898 c3699bab1100
parent 897 48ee5845f0d4
child 899 4db1f2ff3d88
6991543 AI manifests need to be updated with new publisher, origin
usr/src/cmd/auto-install/ai_manifest.xml
usr/src/cmd/auto-install/auto_install.h
usr/src/cmd/auto-install/default.xml
--- a/usr/src/cmd/auto-install/ai_manifest.xml	Thu Oct 14 18:55:13 2010 +0200
+++ b/usr/src/cmd/auto-install/ai_manifest.xml	Fri Oct 15 09:17:57 2010 -0700
@@ -135,8 +135,8 @@
     </target>
     <software name="ips">
       <source>
-        <publisher name="opensolaris.org">
-          <origin name="http://pkg.opensolaris.org/release"/>
+        <publisher name="solaris">
+          <origin name="http://pkg.oracle.com/solaris/release"/>
         </publisher>
       </source>
       <!--
@@ -182,8 +182,8 @@
 
                 <search_all addall="true">
                     <source>
-                        <publisher name="opensolaris.org">
-                            <origin name="http://pkg.opensolaris.org/release"/>
+                        <publisher name="solaris">
+                            <origin name="http://pkg.oracle.com/solaris/release"/>
                         </publisher>
                     </source>
                 </search_all>
@@ -199,7 +199,7 @@
                         <publisher>
                             <origin
 				name=
-		"http://pkg.opensolaris.org/release/p5i/0/driver/firewire.p5i"/>
+	"http://pkg.oracle.com/solaris/release/p5i/0/driver/firewire.p5i"/>
                         </publisher>
                     </source>
 		    <software_data type="P5I"/>
--- a/usr/src/cmd/auto-install/auto_install.h	Thu Oct 14 18:55:13 2010 +0200
+++ b/usr/src/cmd/auto-install/auto_install.h	Fri Oct 15 09:17:57 2010 -0700
@@ -211,8 +211,8 @@
  */
 #define	AIM_IPS_PUBLISHER_URL	\
 	"auto_install/ai_instance/software/source/publisher/origin/name"
-#define	AIM_FALLBACK_PUBLISHER_URL	"http://pkg.opensolaris.org/release"
-#define	AIM_FALLBACK_PUBLISHER_NAME	"opensolaris.org"
+#define	AIM_FALLBACK_PUBLISHER_URL	"http://pkg.oracle.com/solaris/release"
+#define	AIM_FALLBACK_PUBLISHER_NAME	"solaris"
 
 /*
  * Find publisher name and mirror based on url
--- a/usr/src/cmd/auto-install/default.xml	Thu Oct 14 18:55:13 2010 +0200
+++ b/usr/src/cmd/auto-install/default.xml	Fri Oct 15 09:17:57 2010 -0700
@@ -19,7 +19,7 @@
 
  CDDL HEADER END
 
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 
 -->
 <!DOCTYPE auto_install SYSTEM "file:///usr/share/auto_install/ai.dtd">
@@ -27,8 +27,8 @@
   <ai_instance name="default">
     <software>
       <source>
-        <publisher name="opensolaris.org">
-          <origin name="http://pkg.opensolaris.org/release"/>
+        <publisher name="solaris">
+          <origin name="http://pkg.oracle.com/solaris/release"/>
         </publisher>
       </source>
       <!--