--- a/usr/src/cmd/distro_const/manifest/boot_archive_contents_sparc.xml	Thu Aug 04 12:23:40 2011 -0600
+++ b/usr/src/cmd/distro_const/manifest/boot_archive_contents_sparc.xml	Thu Aug 04 11:23:50 2011 -0700
@@ -31,6 +31,9 @@
         <name>usr/bin/sort</name>
         <name>usr/bin/svcs</name>
         <name>usr/bin/sparcv9/sort</name>
+        <name>usr/bin/mkfifo</name>
+        <name>usr/bin/egrep</name>
+        <name>usr/bin/pgrep</name>
         <name>usr/sbin/autopush</name>
         <name>usr/sbin/beadm</name>
         <name>usr/sbin/bootadm</name>
@@ -50,7 +53,6 @@
         <name>usr/sbin/ifparse</name>
         <name>usr/sbin/init</name>
         <name>usr/sbin/in.mpathd</name>
-        <name>usr/sbin/install-finish</name>
         <name>usr/sbin/ipadm</name>
         <name>usr/sbin/ipmpstat</name>
         <name>usr/sbin/jsh</name>
@@ -63,8 +65,8 @@
         <name>usr/sbin/mountall</name>
         <name>usr/sbin/mount_media</name>
         <name>usr/sbin/netstrategy</name>
-        <name>usr/sbin/nwamcfg</name>
-        <name>usr/sbin/nwamadm</name>
+        <name>usr/sbin/netcfg</name>
+        <name>usr/sbin/netadm</name>
         <name>usr/sbin/pfsh</name>
         <name>usr/sbin/rc0</name>
         <name>usr/sbin/rc1</name>

--- a/usr/src/cmd/distro_const/manifest/boot_archive_contents_x86.xml	Thu Aug 04 12:23:40 2011 -0600
+++ b/usr/src/cmd/distro_const/manifest/boot_archive_contents_x86.xml	Thu Aug 04 11:23:50 2011 -0700
@@ -33,6 +33,9 @@
   <name>usr/bin/svcs</name>
   <name>usr/bin/amd64/sort</name>
   <name>usr/bin/pkill</name>
+  <name>usr/bin/mkfifo</name>
+  <name>usr/bin/egrep</name>
+  <name>usr/bin/pgrep</name>
   <name>usr/sbin/autopush</name>
   <name>usr/sbin/beadm</name>
   <name>usr/sbin/biosdev</name>
@@ -53,7 +56,6 @@
   <name>usr/sbin/ifparse</name>
   <name>usr/sbin/init</name>
   <name>usr/sbin/in.mpathd</name>
-  <name>usr/sbin/install-finish</name>
   <name>usr/sbin/installgrub</name>
   <name>usr/sbin/ipadm</name>
   <name>usr/sbin/ipmpstat</name>
@@ -63,13 +65,12 @@
   <name>usr/sbin/metainit</name>
   <name>usr/sbin/metarecover</name>
   <name>usr/sbin/metastat</name>
-  <name>usr/sbin/mkmenu</name>
   <name>usr/sbin/mount</name>
   <name>usr/sbin/mountall</name>
   <name>usr/sbin/mount_media</name>
   <name>usr/sbin/netstrategy</name>
-  <name>usr/sbin/nwamcfg</name>
-  <name>usr/sbin/nwamadm</name>
+  <name>usr/sbin/netcfg</name>
+  <name>usr/sbin/netadm</name>
   <name>usr/sbin/pfsh</name>
   <name>usr/sbin/rc0</name>
   <name>usr/sbin/rc1</name>

--- a/usr/src/cmd/slim-install/svc/live-fs-root-minimal	Thu Aug 04 12:23:40 2011 -0600
+++ b/usr/src/cmd/slim-install/svc/live-fs-root-minimal	Thu Aug 04 11:23:50 2011 -0700
@@ -76,6 +76,10 @@
 		/usr/sbin/svcadm enable svc:/system/filesystem/root-assembly:net
 		/usr/sbin/svcadm disable -s \
 		    svc:/system/filesystem/root-assembly:media
+        else
+        	# enable automatic network configuration for media booted
+                # environments
+                /usr/sbin/svccfg apply /etc/svc/profile/network_nwam.xml
 	fi
 else
 	MEDIA=`/sbin/devprop -s install_media`
@@ -83,6 +87,10 @@
 		/usr/sbin/svcadm enable svc:/system/filesystem/root-assembly:net
 		/usr/sbin/svcadm disable -s \
 		    svc:/system/filesystem/root-assembly:media
+        else
+        	# enable automatic network configuration for media booted
+                # environments
+                /usr/sbin/svccfg apply /etc/svc/profile/network_nwam.xml
 	fi
 fi
 

--- a/usr/src/cmd/slim-install/svc/live-root-fs-minimal.xml	Thu Aug 04 12:23:40 2011 -0600
+++ b/usr/src/cmd/slim-install/svc/live-root-fs-minimal.xml	Thu Aug 04 11:23:50 2011 -0700
@@ -36,6 +36,18 @@
 	type='service'
 	version='1'>
 
+        <!--
+          Make sure network/physical:default runs after this service so
+          networking can be setup correctly
+        -->
+        <dependent
+                name='network-physical-default'
+                type='service'
+                grouping='require_all'
+                restart_on='none'>
+                <service_fmri value='svc:/network/physical:default' />
+        </dependent>
+
 	<create_default_instance enabled='true' />
 
 	<exec_method

--- a/usr/src/cmd/slim-install/svc/media-assembly	Thu Aug 04 12:23:40 2011 -0600
+++ b/usr/src/cmd/slim-install/svc/media-assembly	Thu Aug 04 11:23:50 2011 -0700
@@ -101,9 +101,6 @@
 livessh=`/sbin/devprop -s livessh`
 
 if is_autoinstall; then
-	# Apply the appropriate nwam profile
-	/usr/sbin/svccfg apply /etc/svc/profile/network_nwam.xml
-
 	# If requested, enable remote access via ssh
 	if [ "$livessh" = "enable" ]; then
 		# generate ssh keys