7850 RFE would like support for static network instead of nwam config
10781 RFE - AI Needs to Support DNS Name Service Configuration for Clients
16526 Missing dir in system-install.mf
--- a/usr/src/Makefile.master Mon Jul 26 16:03:51 2010 -0700
+++ b/usr/src/Makefile.master Mon Aug 02 12:15:49 2010 +0200
@@ -105,6 +105,7 @@
ROOTPYTHONVENDORINSTALLTI= $(ROOTPYTHONVENDORINSTALL)/text_install
ROOTPYTHONVENDORINSTALLPROF= $(ROOTPYTHONVENDORINSTALL)/profile
ROOTAUTOINST= $(ROOT)/usr/share/auto_install
+ROOTAUTOINSTSCPROFILES= $(ROOTAUTOINST)/sc_profiles
ROOTSBIN= $(ROOT)/sbin
ROOTUSRBIN= $(ROOT)/usr/bin
ROOTUSRSHARE= $(ROOT)/usr/share
--- a/usr/src/Targetdirs Mon Jul 26 16:03:51 2010 -0700
+++ b/usr/src/Targetdirs Mon Aug 02 12:15:49 2010 +0200
@@ -70,6 +70,7 @@
/usr/lib/python2.6/vendor-packages/osol_install/text_install \
/usr/sbin \
/usr/share/auto_install \
+ /usr/share/auto_install/sc_profiles \
/usr/share/distro_const \
/usr/share/distro_const/auto_install \
/usr/share/distro_const/slim_cd \
--- a/usr/src/cmd/Makefile.targ Mon Jul 26 16:03:51 2010 -0700
+++ b/usr/src/cmd/Makefile.targ Mon Aug 02 12:15:49 2010 +0200
@@ -153,6 +153,9 @@
$(ROOTAUTOINST)/%: %
$(INS.file)
+$(ROOTAUTOINSTSCPROFILES)/%: %
+ $(INS.file)
+
$(ROOTUSRBIN)/%: %
$(INS.file)
--- a/usr/src/cmd/auto-install/Makefile Mon Jul 26 16:03:51 2010 -0700
+++ b/usr/src/cmd/auto-install/Makefile Mon Aug 02 12:15:49 2010 +0200
@@ -52,13 +52,17 @@
ai_manifest.rng \
default.xml
+SC_PROFILE_FILES = static_network.xml
+
ROOTPROGS= $(PROGS:%=$(ROOTUSRBIN)/%)
ROOTPYMODULES= $(PYMODULES:%=$(ROOTPYTHONVENDORINSTALLAI)/%)
ROOTPYCMODULES= $(PYCMODULES:%=$(ROOTPYTHONVENDORINSTALLAI)/%)
-ROOTMANIFESTS= $(MANIFEST_FILES:%=$(ROOTAUTOINST)/%)
+ROOTMANIFESTS= $(MANIFEST_FILES:%=$(ROOTAUTOINST)/%)
+
+ROOTSCPROFILES= $(SC_PROFILE_FILES:%=$(ROOTAUTOINSTSCPROFILES)/%)
LIBDIR = $(ROOTADMINLIB)
LIBDIRS = -L${LIBDIR} -L$(SFWLIBDIR) -R$(SFWLIBRDIR) -L$(ROOTUSRLIB)
@@ -106,6 +110,7 @@
$(ROOTPYTHONVENDORINSTALLAI) \
$(ROOTMANIFESTS) \
$(ROOTPYMODULES) $(ROOTPYCMODULES) \
+ $(ROOTSCPROFILES) \
$(SUBDIRS) \
.WAIT msgs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/auto-install/static_network.xml Mon Aug 02 12:15:49 2010 +0200
@@ -0,0 +1,105 @@
+<!--
+CDDL HEADER START
+
+The contents of this file are subject to the terms of the
+Common Development and Distribution License (the "License").
+You may not use this file except in compliance with the License.
+
+You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+or http://www.opensolaris.org/os/licensing.
+See the License for the specific language governing permissions
+and limitations under the License.
+
+When distributing Covered Code, include this CDDL HEADER in each
+file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+If applicable, add the following below this CDDL HEADER, with the
+fields enclosed by brackets "[]" replaced with your own identifying
+information: Portions Copyright [yyyy] [name of copyright owner]
+
+CDDL HEADER END
+
+Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+-->
+
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="profile" name="system configuration">
+ <service name="system/install/config" version="1" type="service">
+ <instance name="default" enabled="true">
+ <property_group name="user_account" type="application">
+ <propval name="login" type="astring" value="jack"/>
+ <propval name="password" type="astring" value="9Nd/cwBcNWFZg"/>
+ <propval name="description" type="astring" value="default_user"/>
+ <propval name="shell" type="astring" value="/usr/bin/bash"/>
+ <propval name="uid" type='count' value='101'/>
+ <propval name="gid" type='count' value='10'/>
+ <propval name="type" type="astring" value="normal"/>
+ <propval name="roles" type="astring" value="root"/>
+ </property_group>
+
+ <property_group name="root_account" type="application">
+ <propval name="password" type="astring" value="$5$VgppCOxA$ycFmYW4ObRRHhtsGEygDdexk5bugqgSiaSR9niNCouC"/>
+ <propval name="type" type="astring" value="role"/>
+ </property_group>
+
+ <property_group name="other_sc_params" type="application">
+ <propval name="timezone" type="astring" value="GMT"/>
+ <propval name="hostname" type="astring" value="opensolaris"/>
+ </property_group>
+ </instance>
+ </service>
+
+ <service name="system/console-login" version="1" type="service">
+ <property_group name="ttymon" type="application">
+ <propval name="terminal_type" type="astring" value="sun"/>
+ </property_group>
+ </service>
+
+ <service name='system/keymap' version='1' type='service'>
+ <instance name='default' enabled='true'>
+ <property_group name='keymap' type='system'>
+ <propval name='layout' type='astring' value='US-English'/>
+ </property_group>
+ </instance>
+ </service>
+
+ <service name="network/physical" version="1" type="service">
+ <instance name="nwam" enabled="false"/>
+ <instance name="default" enabled="true"/>
+ </service>
+
+ <service name='network/install' version='1' type='service'>
+ <instance name='default' enabled='true'>
+ <property_group name='install_ipv4_interface' type='application'>
+ <propval name='name' type='astring' value='net0/v4'/>
+ <propval name='address_type' type='astring' value='static'/>
+ <propval name='static_address' type='net_address_v4' value='x.x.x.x/n'/>
+ <propval name='default_route' type='net_address_v4' value='x.x.x.x'/>
+ </property_group>
+
+ <property_group name='install_ipv6_interface' type='application'>
+ <propval name='name' type='astring' value='net0/v6'/>
+ <propval name='address_type' type='astring' value='addrconf'/>
+ <propval name='stateless' type='astring' value='yes'/>
+ <propval name='stateful' type='astring' value='yes'/>
+ </property_group>
+ </instance>
+ </service>
+
+ <service name='network/dns/install' version='1' type='service'>
+ <instance name='default' enabled='true'>
+ <property_group name='install_props' type='application'>
+ <property name='nameserver' type='net_address'>
+ <net_address_list>
+ <value_node value='x.x.x.x'/>
+ </net_address_list>
+ </property>
+ <property name='search' type='astring'>
+ <astring_list>
+ <value_node value='example.com'/>
+ </astring_list>
+ </property>
+ </property_group>
+ </instance>
+ </service>
+</service_bundle>
+
--- a/usr/src/pkg/manifests/system-install-auto-install-auto-install-common.mf Mon Jul 26 16:03:51 2010 -0700
+++ b/usr/src/pkg/manifests/system-install-auto-install-auto-install-common.mf Mon Aug 02 12:15:49 2010 +0200
@@ -37,11 +37,13 @@
dir path=usr/lib/python2.6/vendor-packages/osol_install/auto_install
dir path=usr/share group=sys
dir path=usr/share/auto_install group=sys
+dir path=usr/share/auto_install/sc_profiles group=sys
file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/__init__.py mode=0444
file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/__init__.pyc mode=0444
file path=usr/share/auto_install/ai_manifest.rng mode=0444 group=sys
file path=usr/share/auto_install/ai_manifest.xml mode=0444 group=sys
file path=usr/share/auto_install/default.xml mode=0444 group=sys
+file path=usr/share/auto_install/sc_profiles/static_network.xml mode=0444 group=sys
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
--- a/usr/src/pkg/manifests/system-install.mf Mon Jul 26 16:03:51 2010 -0700
+++ b/usr/src/pkg/manifests/system-install.mf Mon Aug 02 12:15:49 2010 +0200
@@ -33,6 +33,7 @@
dir path=lib/svc
dir path=lib/svc/manifest group=sys
dir path=lib/svc/manifest/system group=sys
+dir path=lib/svc/manifest/system/install group=sys
dir path=lib/svc/method
dir path=sbin group=sys
dir path=usr group=sys