--- a/usr/src/cmd/distro_const/auto_install/ai_sparc_image.xml	Wed Nov 10 15:05:49 2010 -0800
+++ b/usr/src/cmd/distro_const/auto_install/ai_sparc_image.xml	Fri Nov 12 10:11:31 2010 -0800
@@ -336,7 +336,7 @@
 			<base_include type="file">usr/lib/libpool.so.1</base_include>
 			<base_include type="file">usr/lib/libidmap.so.1</base_include>
 			<base_include type="file">usr/lib/libldap.so.5</base_include>
-			<base_include type="file">usr/lib/libldap.so.1</base_include>
+			<base_include type="file">usr/lib/libsldap.so.1</base_include>
 			<base_include type="file">usr/lib/libadutils.so.1</base_include>
 			<base_include type="file">usr/lib/libsasl.so.1</base_include>
 			<base_include type="file">usr/lib/mps/libnspr4.so</base_include>
@@ -383,6 +383,12 @@
 			<base_include type="file">usr/bin/vi</base_include>
 			<base_include type="file">usr/bin/wget</base_include>
 			<base_include type="file">usr/has/bin/vi</base_include>
+			<base_include type="file">usr/lib/inet/wanboot/netbootinfo</base_include>
+
+			<!-- Libraries needed for netbootinfo binary -->
+                        <base_include type="file">usr/lib/libwanbootutil.so.1</base_include>
+                        <base_include type="file">usr/lib/libwanboot.so.1</base_include>
+
 			<base_include type="file">usr/lib/fs/hsfs/fstyp</base_include>
 			<base_include type="file">usr/lib/fs/hsfs/fstyp.so.1</base_include>
 			<base_include type="file">usr/lib/fs/hsfs/mount</base_include>

--- a/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml	Wed Nov 10 15:05:49 2010 -0800
+++ b/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml	Fri Nov 12 10:11:31 2010 -0800
@@ -388,7 +388,7 @@
 			<base_include type="file">usr/lib/libpool.so.1</base_include>
 			<base_include type="file">usr/lib/libidmap.so.1</base_include>
 			<base_include type="file">usr/lib/libldap.so.5</base_include>
-			<base_include type="file">usr/lib/libldap.so.1</base_include>
+			<base_include type="file">usr/lib/libsldap.so.1</base_include>
 			<base_include type="file">usr/lib/libadutils.so.1</base_include>
 			<base_include type="file">usr/lib/libsasl.so.1</base_include>
 			<base_include type="file">usr/lib/mps/libnspr4.so</base_include>
@@ -466,6 +466,11 @@
 			<base_include type="file">usr/lib/libdll.so.1</base_include>
 			<base_include type="file">usr/lib/libshell.so.1</base_include>
 			<base_include type="file">usr/lib/libcrypt.so.1</base_include>
+			<base_include type="file">usr/lib/inet/wanboot/netbootinfo</base_include>
+
+			<!-- Libraries needed for netbootinfo binary -->
+                        <base_include type="file">usr/lib/libwanbootutil.so.1</base_include>
+                        <base_include type="file">usr/lib/libwanboot.so.1</base_include>
 
 			<!-- libraries needed by /usr/bin/wget -->
 			<base_include type="file">usr/lib/libidn.so.11</base_include>

--- a/usr/src/cmd/slim-install/svc/net-fs-root	Wed Nov 10 15:05:49 2010 -0800
+++ b/usr/src/cmd/slim-install/svc/net-fs-root	Fri Nov 12 10:11:31 2010 -0800
@@ -63,9 +63,6 @@
 
 echo "Preparing automated install image for use" > /dev/msglog
 
-# Prime the network
-/sbin/dhcpagent -a
-
 #
 # For SPARC mount wanbootfs which contains wanboot.conf file
 # associated with this client. root_file option defined there