diff --git a/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml b/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml
index b2d97818..e2a51634 100644
--- a/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml
+++ b/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml
@@ -178,7 +178,7 @@
 		-->
 		<pkg_repo_default_authority>
 			<main
-				url="https://pkg.openindiana.aurora-opencloud.org/oi-sparc"
+				url="https://pkg.openindiana.aurora-opencloud.org/oi-sparc/"
 				authname="openindiana.org"/>
 			<!--
 			     If you want to use one or more  mirrors that are
@@ -233,9 +233,8 @@
 		    Uncomment before using.
 		<post_install_repo_addl_authority>
 			<main
-				url=""
-				authname=""/>
-			<mirror url="" />
+				url="http://your.build.host:10000/"
+				authname="userland"/>
 		</post_install_repo_addl_authority>
 		-->
 		<!--
@@ -293,8 +292,8 @@
 			<base_include type="file">usr/bin/bash</base_include>
 			<base_include type="file">usr/bin/cat</base_include>
 			<base_include type="file">usr/bin/cd</base_include>
-			<base_include type="file">usr/bin/coreadm</base_include>
 			<base_include type="file">usr/bin/cp</base_include>
+			<base_include type="file">usr/bin/coreadm</base_include>
 			<base_include type="file">usr/bin/cut</base_include>
 			<base_include type="file">usr/bin/echo</base_include>
 			<base_include type="file">usr/bin/expr</base_include>
@@ -325,33 +324,6 @@
 			<base_include type="file">usr/bin/vi</base_include>
 			<base_include type="file">usr/bin/which</base_include>
 			<base_include type="file">usr/has/bin/vi</base_include>
-			<base_include type="file">usr/sbin/chroot</base_include>
-			<base_include type="file">usr/sbin/devfsadm</base_include>
-			<base_include type="file">usr/sbin/df</base_include>
-			<base_include type="file">usr/sbin/format</base_include>
-			<base_include type="file">usr/sbin/hostconfig</base_include>
-			<base_include type="file">usr/sbin/lofiadm</base_include>
-			<base_include type="file">usr/sbin/modload</base_include>
-			<base_include type="file">usr/sbin/mount</base_include>
-			<base_include type="file">usr/sbin/nwamadm</base_include>
-			<base_include type="file">usr/sbin/nwamcfg</base_include>
-			<base_include type="file">usr/sbin/ping</base_include>
-			<base_include type="file">usr/sbin/pmadm</base_include>
-			<base_include type="file">usr/sbin/prtconf</base_include>
-			<base_include type="file">usr/sbin/prtvtoc</base_include>
-			<base_include type="file">usr/sbin/svccfg</base_include>
-			<base_include type="file">usr/sbin/svcadm</base_include>
-			<base_include type="file">usr/sbin/syslogd</base_include>
-			<base_include type="file">usr/share/lib/xml/dtd/service_bundle.dtd.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>
-			<base_include type="file">usr/lib/fs/tmpfs/mount</base_include>
-			<base_include type="file">usr/lib/fs/ufs/fstyp</base_include>
-			<base_include type="file">usr/lib/fs/ufs/fstyp.so.1</base_include>
-			<base_include type="file">usr/lib/fs/ufs/mount</base_include>
-			<base_include type="file">usr/lib/libfstyp.so.1</base_include>
-			<base_include type="file">usr/lib/platexec</base_include>
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_audio_link.so</base_include>
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_cfg_link.so</base_include>
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_disk_link.so</base_include>
@@ -366,32 +338,58 @@
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_usb_link.so</base_include>
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_zfs_link.so</base_include>
 			<base_include type="file">usr/lib/devfsadm/devfsadmd</base_include>
-			<base_include type="file">usr/lib/libm.so</base_include>
-			<base_include type="file">usr/lib/libm.so.2</base_include>
-			<base_include type="file">usr/lib/64/libm.so</base_include>
-			<base_include type="file">usr/lib/64/libm.so.2</base_include>
-			<base_include type="file">usr/lib/libfstyp.so</base_include>
-			<base_include type="file">usr/lib/libz.so</base_include>
-			<base_include type="file">usr/lib/libz.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>
+			<base_include type="file">usr/lib/fs/tmpfs/mount</base_include>
+			<base_include type="file">usr/lib/fs/ufs/fstyp</base_include>
+			<base_include type="file">usr/lib/fs/ufs/fstyp.so.1</base_include>
+			<base_include type="file">usr/lib/fs/ufs/mount</base_include>
 			<base_include type="file">usr/lib/isaexec</base_include>
 			<base_include type="file">usr/lib/libast.so.1</base_include>
 			<base_include type="file">usr/lib/64/libast.so.1</base_include>
 			<base_include type="file">usr/lib/libcmd.so.1</base_include>
 			<base_include type="file">usr/lib/64/libcmd.so.1</base_include>
+			<base_include type="file">usr/lib/libcrypt.so.1</base_include>
 			<base_include type="file">usr/lib/libdll.so.1</base_include>
 			<base_include type="file">usr/lib/64/libdll.so.1</base_include>
+			<base_include type="file">usr/lib/libfstyp.so</base_include>
+			<base_include type="file">usr/lib/libfstyp.so.1</base_include>
+			<base_include type="file">usr/lib/libm.so</base_include>
+			<base_include type="file">usr/lib/libm.so.2</base_include>
+			<base_include type="file">usr/lib/64/libm.so</base_include>
+			<base_include type="file">usr/lib/64/libm.so.2</base_include>
+			<base_include type="file">usr/lib/libmapmalloc.so.1</base_include>
 			<base_include type="file">usr/lib/libshell.so.1</base_include>
 			<base_include type="file">usr/lib/64/libshell.so.1</base_include>
-			<base_include type="file">usr/lib/libcrypt.so.1</base_include>
-			<base_include type="file">usr/lib/libmapmalloc.so.1</base_include>
+			<base_include type="file">usr/lib/libz.so</base_include>
+			<base_include type="file">usr/lib/libz.so.1</base_include>
+			<base_include type="file">usr/lib/platexec</base_include>
+			<base_include type="file">usr/sbin/chroot</base_include>
+			<base_include type="file">usr/sbin/devfsadm</base_include>
+			<base_include type="file">usr/sbin/df</base_include>
+			<base_include type="file">usr/sbin/format</base_include>
+			<base_include type="file">usr/sbin/hostconfig</base_include>
+			<base_include type="file">usr/sbin/lofiadm</base_include>
+			<base_include type="file">usr/sbin/modload</base_include>
+			<base_include type="file">usr/sbin/mount</base_include>
+			<base_include type="file">usr/sbin/nwamadm</base_include>
+			<base_include type="file">usr/sbin/nwamcfg</base_include>
+			<base_include type="file">usr/sbin/ping</base_include>
+			<base_include type="file">usr/sbin/pmadm</base_include>
+			<base_include type="file">usr/sbin/prtconf</base_include>
+			<base_include type="file">usr/sbin/prtvtoc</base_include>
+			<base_include type="file">usr/sbin/svcadm</base_include>
+			<base_include type="file">usr/sbin/svccfg</base_include>
+			<base_include type="file">usr/sbin/syslogd</base_include>
 			<base_include type="file">usr/share/lib/xml/dtd/service_bundle.dtd.1</base_include>
-			<base_include type="file">var/sadm/install/admin/default</base_include>
-			<base_include type="file">var/sadm/install/contents</base_include>
 			<base_include type="file">var/adm/utmpx</base_include>
 			<base_include type="file">var/adm/wtmpx</base_include>
 			<base_include type="file">var/adm/aculog</base_include>
 			<base_include type="file">var/log/authlog</base_include>
 			<base_include type="file">var/log/syslog</base_include>
+			<base_include type="file">var/sadm/install/admin/default</base_include>
+			<base_include type="file">var/sadm/install/contents</base_include>
 			<base_include type="file">var/saf/zsmon/log</base_include>
 			<base_include type="file">var/spool/cron/crontabs/adm</base_include>
 			<base_include type="file">var/spool/cron/crontabs/root</base_include>
diff --git a/usr/src/cmd/distro_const/text_install/text_mode_sparc_minimal.xml b/usr/src/cmd/distro_const/text_install/text_mode_sparc_minimal.xml
index 806f14ca..1e14af02 100644
--- a/usr/src/cmd/distro_const/text_install/text_mode_sparc_minimal.xml
+++ b/usr/src/cmd/distro_const/text_install/text_mode_sparc_minimal.xml
@@ -21,7 +21,7 @@
     Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
     XML specification for building the limited language OpenIndiana
-    Minimal Text Mode Installer iso and usb image
+    Minimal new Text Mode iso/usb Installer for SPARC
 -->
 
 <distribution name="OpenIndiana_Minimal_SPARC">
@@ -99,6 +99,11 @@
 						".textinstall"
 					</argslist>
 				</script>
+				<script name="/usr/share/distro_const/boot_archive_compress_usr">
+					<checkpoint
+						name="ba-usrtar"
+						message="Boot archive compress /usr"/>
+				</script>
 				<script name="/usr/share/distro_const/plat_setup.py">
 					<checkpoint
 						name="plat-setup"
@@ -292,8 +297,8 @@
 			<base_include type="file">usr/bin/bash</base_include>
 			<base_include type="file">usr/bin/cat</base_include>
 			<base_include type="file">usr/bin/cd</base_include>
-			<base_include type="file">usr/bin/coreadm</base_include>
 			<base_include type="file">usr/bin/cp</base_include>
+			<base_include type="file">usr/bin/coreadm</base_include>
 			<base_include type="file">usr/bin/cut</base_include>
 			<base_include type="file">usr/bin/echo</base_include>
 			<base_include type="file">usr/bin/expr</base_include>
@@ -324,33 +329,6 @@
 			<base_include type="file">usr/bin/vi</base_include>
 			<base_include type="file">usr/bin/which</base_include>
 			<base_include type="file">usr/has/bin/vi</base_include>
-			<base_include type="file">usr/sbin/chroot</base_include>
-			<base_include type="file">usr/sbin/devfsadm</base_include>
-			<base_include type="file">usr/sbin/df</base_include>
-			<base_include type="file">usr/sbin/format</base_include>
-			<base_include type="file">usr/sbin/hostconfig</base_include>
-			<base_include type="file">usr/sbin/lofiadm</base_include>
-			<base_include type="file">usr/sbin/modload</base_include>
-			<base_include type="file">usr/sbin/mount</base_include>
-			<base_include type="file">usr/sbin/nwamadm</base_include>
-			<base_include type="file">usr/sbin/nwamcfg</base_include>
-			<base_include type="file">usr/sbin/ping</base_include>
-			<base_include type="file">usr/sbin/pmadm</base_include>
-			<base_include type="file">usr/sbin/prtconf</base_include>
-			<base_include type="file">usr/sbin/prtvtoc</base_include>
-			<base_include type="file">usr/sbin/svccfg</base_include>
-			<base_include type="file">usr/sbin/svcadm</base_include>
-			<base_include type="file">usr/sbin/syslogd</base_include>
-			<base_include type="file">usr/share/lib/xml/dtd/service_bundle.dtd.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>
-			<base_include type="file">usr/lib/fs/tmpfs/mount</base_include>
-			<base_include type="file">usr/lib/fs/ufs/fstyp</base_include>
-			<base_include type="file">usr/lib/fs/ufs/fstyp.so.1</base_include>
-			<base_include type="file">usr/lib/fs/ufs/mount</base_include>
-			<base_include type="file">usr/lib/libfstyp.so.1</base_include>
-			<base_include type="file">usr/lib/platexec</base_include>
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_audio_link.so</base_include>
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_cfg_link.so</base_include>
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_disk_link.so</base_include>
@@ -365,32 +343,58 @@
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_usb_link.so</base_include>
 			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_zfs_link.so</base_include>
 			<base_include type="file">usr/lib/devfsadm/devfsadmd</base_include>
-			<base_include type="file">usr/lib/libm.so</base_include>
-			<base_include type="file">usr/lib/libm.so.2</base_include>
-			<base_include type="file">usr/lib/64/libm.so</base_include>
-			<base_include type="file">usr/lib/64/libm.so.2</base_include>
-			<base_include type="file">usr/lib/libfstyp.so</base_include>
-			<base_include type="file">usr/lib/libz.so</base_include>
-			<base_include type="file">usr/lib/libz.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>
+			<base_include type="file">usr/lib/fs/tmpfs/mount</base_include>
+			<base_include type="file">usr/lib/fs/ufs/fstyp</base_include>
+			<base_include type="file">usr/lib/fs/ufs/fstyp.so.1</base_include>
+			<base_include type="file">usr/lib/fs/ufs/mount</base_include>
 			<base_include type="file">usr/lib/isaexec</base_include>
 			<base_include type="file">usr/lib/libast.so.1</base_include>
 			<base_include type="file">usr/lib/64/libast.so.1</base_include>
 			<base_include type="file">usr/lib/libcmd.so.1</base_include>
 			<base_include type="file">usr/lib/64/libcmd.so.1</base_include>
+			<base_include type="file">usr/lib/libcrypt.so.1</base_include>
 			<base_include type="file">usr/lib/libdll.so.1</base_include>
 			<base_include type="file">usr/lib/64/libdll.so.1</base_include>
+			<base_include type="file">usr/lib/libfstyp.so</base_include>
+			<base_include type="file">usr/lib/libfstyp.so.1</base_include>
+			<base_include type="file">usr/lib/libm.so</base_include>
+			<base_include type="file">usr/lib/libm.so.2</base_include>
+			<base_include type="file">usr/lib/64/libm.so</base_include>
+			<base_include type="file">usr/lib/64/libm.so.2</base_include>
+			<base_include type="file">usr/lib/libmapmalloc.so.1</base_include>
 			<base_include type="file">usr/lib/libshell.so.1</base_include>
 			<base_include type="file">usr/lib/64/libshell.so.1</base_include>
-			<base_include type="file">usr/lib/libcrypt.so.1</base_include>
-			<base_include type="file">usr/lib/libmapmalloc.so.1</base_include>
+			<base_include type="file">usr/lib/libz.so</base_include>
+			<base_include type="file">usr/lib/libz.so.1</base_include>
+			<base_include type="file">usr/lib/platexec</base_include>
+			<base_include type="file">usr/sbin/chroot</base_include>
+			<base_include type="file">usr/sbin/devfsadm</base_include>
+			<base_include type="file">usr/sbin/df</base_include>
+			<base_include type="file">usr/sbin/format</base_include>
+			<base_include type="file">usr/sbin/hostconfig</base_include>
+			<base_include type="file">usr/sbin/lofiadm</base_include>
+			<base_include type="file">usr/sbin/modload</base_include>
+			<base_include type="file">usr/sbin/mount</base_include>
+			<base_include type="file">usr/sbin/nwamadm</base_include>
+			<base_include type="file">usr/sbin/nwamcfg</base_include>
+			<base_include type="file">usr/sbin/ping</base_include>
+			<base_include type="file">usr/sbin/pmadm</base_include>
+			<base_include type="file">usr/sbin/prtconf</base_include>
+			<base_include type="file">usr/sbin/prtvtoc</base_include>
+			<base_include type="file">usr/sbin/svcadm</base_include>
+			<base_include type="file">usr/sbin/svccfg</base_include>
+			<base_include type="file">usr/sbin/syslogd</base_include>
 			<base_include type="file">usr/share/lib/xml/dtd/service_bundle.dtd.1</base_include>
-			<base_include type="file">var/sadm/install/admin/default</base_include>
-			<base_include type="file">var/sadm/install/contents</base_include>
 			<base_include type="file">var/adm/utmpx</base_include>
 			<base_include type="file">var/adm/wtmpx</base_include>
 			<base_include type="file">var/adm/aculog</base_include>
 			<base_include type="file">var/log/authlog</base_include>
 			<base_include type="file">var/log/syslog</base_include>
+			<base_include type="file">var/sadm/install/admin/default</base_include>
+			<base_include type="file">var/sadm/install/contents</base_include>
 			<base_include type="file">var/saf/zsmon/log</base_include>
 			<base_include type="file">var/spool/cron/crontabs/adm</base_include>
 			<base_include type="file">var/spool/cron/crontabs/root</base_include>
diff --git a/usr/src/cmd/distro_const/text_install/text_mode_x86.xml b/usr/src/cmd/distro_const/text_install/text_mode_x86.xml
index d84a2fc7..2102655b 100644
--- a/usr/src/cmd/distro_const/text_install/text_mode_x86.xml
+++ b/usr/src/cmd/distro_const/text_install/text_mode_x86.xml
@@ -303,119 +303,108 @@
 		     must exist in the pkg_image area.
 		-->
 		<boot_archive_contents>
-			<base_include type="file">usr/bin/nawk</base_include>
-			<base_include type="file">usr/bin/mkdir</base_include>
-			<base_include type="file">usr/bin/cp</base_include>
-			<base_include type="file">usr/bin/sed</base_include>
-			<base_include type="file">usr/bin/sort</base_include>
-			<base_include type="file">usr/bin/amd64/sort</base_include>
-			<base_include type="file">usr/bin/i86/sort</base_include>
-			<base_include type="file">usr/bin/pkill</base_include>
-			<base_include type="file">usr/sbin/svcadm</base_include>
-			<base_include type="file">usr/sbin/svccfg</base_include>
-			<base_include type="file">usr/sbin/prtconf</base_include>
-			<base_include type="file">usr/sbin/amd64/prtconf</base_include>
-			<base_include type="file">usr/sbin/i86/prtconf</base_include>
-			<base_include type="file">usr/sbin/nwamcfg</base_include>
-			<base_include type="file">usr/sbin/nwamadm</base_include>
-
-			<!-- libraries needed by /usr/bin/bash -->
-			<base_include type="file">usr/lib/64/libncurses.so.5</base_include>
-			<base_include type="file">usr/lib/64/libncurses.so.5.9</base_include>
-
-			<!-- libraries needed by /usr/sbin/prtconf -->
-			<base_include type="file">usr/lib/libsmbios.so.1</base_include>
-
-			<!-- libraries needed by /usr/sbin/svccfg -->
-			<base_include type="file">lib/libscf.so.1</base_include>
-			<base_include type="file">lib/libuutil.so.1</base_include>
-			<base_include type="file">lib/libumem.so.1</base_include>
-			<base_include type="file">lib/libmd.so.1</base_include>
-			<base_include type="file">lib/libnvpair.so.1</base_include>
-			<base_include type="file">lib/libc.so.1</base_include>
-			<base_include type="file">lib/libpthread.so.1</base_include>
-			<base_include type="file">lib/libm.so.2</base_include>
-			<base_include type="file">lib/libsocket.so.1</base_include>
-			<base_include type="file">lib/libnsl.so.1</base_include>
-			<base_include type="file">lib/libgen.so.1</base_include>
-			<base_include type="file">lib/libcurses.so.1</base_include>
-			<base_include type="file">lib/librt.so.1</base_include>
-			<base_include type="file">lib/libmp.so.2</base_include>
-			<base_include type="file">lib/libdevinfo.so.1</base_include>
-			<base_include type="file">lib/libsec.so.1</base_include>
-			<base_include type="file">lib/libavl.so.1</base_include>
-			<base_include type="file">usr/lib/libxml2.so.2</base_include>
-			<base_include type="file">usr/lib/libl.so.1</base_include>
-			<base_include type="file">usr/lib/libtecla.so.1</base_include>
-			<base_include type="file">usr/lib/libz.so.1</base_include>
-			<base_include type="file">usr/lib/liblzma.so.5</base_include>
-			<base_include type="file">usr/lib/libicuuc.so.68</base_include>
-			<base_include type="file">usr/lib/libsmbios.so.1</base_include>
-			<base_include type="file">usr/lib/libicudata.so.68</base_include>
-			<base_include type="file">usr/lib/libidmap.so.1</base_include>
-
-			<base_include type="file">usr/sbin/pmadm</base_include>
-			<base_include type="file">usr/sbin/lofiadm</base_include>
-			<base_include type="file">usr/sbin/devfsadm</base_include>
-			<base_include type="file">usr/sbin/modload</base_include>
-			<base_include type="file">usr/sbin/i86/modload</base_include>
-			<base_include type="file">usr/sbin/mount</base_include>
-			<base_include type="file">usr/sbin/hostconfig</base_include>
-			<base_include type="file">usr/sbin/chroot</base_include>
-			<base_include type="file">usr/sbin/syslogd</base_include>
-			<base_include type="file">usr/bin/coreadm</base_include>
 			<base_include type="file">usr/bin/bash</base_include>
-			<base_include type="file">usr/bin/ksh</base_include>
 			<base_include type="file">usr/bin/cat</base_include>
+			<base_include type="file">usr/bin/cd</base_include>
+			<base_include type="file">usr/bin/cp</base_include>
+			<base_include type="file">usr/bin/coreadm</base_include>
+			<base_include type="file">usr/bin/cut</base_include>
 			<base_include type="file">usr/bin/echo</base_include>
+			<base_include type="file">usr/bin/expr</base_include>
 			<base_include type="file">usr/bin/false</base_include>
+			<base_include type="file">usr/bin/file</base_include>
 			<base_include type="file">usr/bin/grep</base_include>
+			<base_include type="file">usr/bin/i86/ksh</base_include>
+			<base_include type="file">usr/bin/ksh</base_include>
+			<base_include type="file">usr/bin/ldd</base_include>
+			<base_include type="file">usr/bin/less</base_include>
 			<base_include type="file">usr/bin/ls</base_include>
+			<base_include type="file">usr/bin/mkdir</base_include>
+			<base_include type="file">usr/bin/more</base_include>
+			<base_include type="file">usr/bin/nawk</base_include>
+			<base_include type="file">usr/bin/pkill</base_include>
+			<base_include type="file">usr/bin/ps</base_include>
 			<base_include type="file">usr/bin/rm</base_include>
+			<base_include type="file">usr/bin/sed</base_include>
+			<base_include type="file">usr/bin/sleep</base_include>
+			<base_include type="file">usr/bin/sort</base_include>
 			<base_include type="file">usr/bin/svcprop</base_include>
-			<base_include type="file">usr/bin/true</base_include>
-			<base_include type="file">usr/bin/cd</base_include>
+			<base_include type="file">usr/bin/svcs</base_include>
+			<base_include type="file">usr/bin/tail</base_include>
 			<base_include type="file">usr/bin/test</base_include>
-			<base_include type="file">usr/bin/sleep</base_include>
-			<base_include type="file">usr/bin/expr</base_include>
+			<base_include type="file">usr/bin/true</base_include>
 			<base_include type="file">usr/bin/vi</base_include>
+			<base_include type="file">usr/bin/which</base_include>
 			<base_include type="file">usr/has/bin/vi</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_audio_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_cfg_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_disk_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_fssnap_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_ieee1394_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_lofi_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_misc_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_port_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_ramdisk_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_sgen_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_tape_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_usb_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_zfs_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/devfsadmd</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>
+			<base_include type="file">usr/lib/fs/tmpfs/mount</base_include>
 			<base_include type="file">usr/lib/fs/ufs/fstyp</base_include>
 			<base_include type="file">usr/lib/fs/ufs/fstyp.so.1</base_include>
 			<base_include type="file">usr/lib/fs/ufs/mount</base_include>
-			<base_include type="file">usr/lib/libfstyp.so.1</base_include>
-			<base_include type="file">usr/lib/platexec</base_include>
-			<base_include type="file">usr/lib/devfsadm/devfsadmd</base_include>
-			<base_include type="file">usr/lib/libm.so.2</base_include>
-			<base_include type="file">usr/lib/libm.so</base_include>
-			<base_include type="file">usr/lib/libfstyp.so</base_include>
-			<base_include type="file">usr/lib/libz.so</base_include>
-			<base_include type="file">usr/lib/libz.so.1</base_include>
-			<base_include type="file">usr/bin/i86/ksh93</base_include>
 			<base_include type="file">usr/lib/isaexec</base_include>
 			<base_include type="file">usr/lib/libast.so.1</base_include>
+			<base_include type="file">usr/lib/64/libast.so.1</base_include>
 			<base_include type="file">usr/lib/libcmd.so.1</base_include>
+			<base_include type="file">usr/lib/64/libcmd.so.1</base_include>
+			<base_include type="file">usr/lib/libcrypt.so.1</base_include>
 			<base_include type="file">usr/lib/libdll.so.1</base_include>
+			<base_include type="file">usr/lib/64/libdll.so.1</base_include>
+			<base_include type="file">usr/lib/libfstyp.so</base_include>
+			<base_include type="file">usr/lib/libfstyp.so.1</base_include>
+			<base_include type="file">usr/lib/libm.so</base_include>
+			<base_include type="file">usr/lib/libm.so.2</base_include>
+			<base_include type="file">usr/lib/64/libm.so</base_include>
+			<base_include type="file">usr/lib/64/libm.so.2</base_include>
+			<base_include type="file">usr/lib/libmapmalloc.so.1</base_include>
 			<base_include type="file">usr/lib/libshell.so.1</base_include>
+			<base_include type="file">usr/lib/64/libshell.so.1</base_include>
+			<base_include type="file">usr/lib/libz.so</base_include>
+			<base_include type="file">usr/lib/libz.so.1</base_include>
+			<base_include type="file">usr/lib/platexec</base_include>
+			<base_include type="file">usr/sbin/chroot</base_include>
+			<base_include type="file">usr/sbin/devfsadm</base_include>
+			<base_include type="file">usr/sbin/df</base_include>
+			<base_include type="file">usr/sbin/format</base_include>
+			<base_include type="file">usr/sbin/hostconfig</base_include>
+			<base_include type="file">usr/sbin/lofiadm</base_include>
+			<base_include type="file">usr/sbin/modload</base_include>
+			<base_include type="file">usr/sbin/mount</base_include>
+			<base_include type="file">usr/sbin/nwamadm</base_include>
+			<base_include type="file">usr/sbin/nwamcfg</base_include>
+			<base_include type="file">usr/sbin/ping</base_include>
+			<base_include type="file">usr/sbin/pmadm</base_include>
+			<base_include type="file">usr/sbin/prtconf</base_include>
+			<base_include type="file">usr/sbin/prtvtoc</base_include>
+			<base_include type="file">usr/sbin/svcadm</base_include>
+			<base_include type="file">usr/sbin/svccfg</base_include>
+			<base_include type="file">usr/sbin/syslogd</base_include>
 			<base_include type="file">usr/share/lib/xml/dtd/service_bundle.dtd.1</base_include>
-			<base_include type="file">var/sadm/install/admin/default</base_include>
-			<base_include type="file">var/sadm/system/admin/default_java</base_include>
-			<base_include type="file">var/sadm/install/contents</base_include>
 			<base_include type="file">var/adm/utmpx</base_include>
 			<base_include type="file">var/adm/wtmpx</base_include>
 			<base_include type="file">var/adm/aculog</base_include>
-			<base_include type="file">var/lib/postrun/postrun-runq</base_include>
-			<base_include type="file">var/lib/postrun/postrun</base_include>
-			<base_include type="file">var/log/postrun.log</base_include>
 			<base_include type="file">var/log/authlog</base_include>
 			<base_include type="file">var/log/syslog</base_include>
+			<base_include type="file">var/sadm/install/admin/default</base_include>
+			<base_include type="file">var/sadm/install/contents</base_include>
 			<base_include type="file">var/saf/zsmon/log</base_include>
 			<base_include type="file">var/spool/cron/crontabs/adm</base_include>
 			<base_include type="file">var/spool/cron/crontabs/root</base_include>
-			<base_include type="file">var/nis/NIS+LDAPmapping.template</base_include>
 			<base_include type="file">var/yp/aliases</base_include>
 			<base_include type="file">var/yp/nicknames</base_include>
 			<base_include type="dir">kernel</base_include>
@@ -433,11 +422,133 @@
 			<base_include type="dir">var/svc/profile</base_include>
 			<base_include type="dir">var/sadm</base_include>
 			<base_include type="dir">etc</base_include>
-			<base_exclude type="dir">etc/gconf</base_exclude>
-			<base_exclude type="dir">etc/brltty</base_exclude>
-			<base_exclude type="dir">etc/gtk-2.0</base_exclude>
 			<base_exclude type="dir">etc/notices</base_exclude>
 			<base_exclude type="dir">var/sadm/pkg</base_exclude>
+
+			<!-- libraries for /lib/svc/method/svc-fcoei BugID: #16318-->
+			<base_include type="file">lib/libavl.so.1</base_include>
+			<base_include type="file">lib/libdevinfo.so.1</base_include>
+			<base_include type="file">lib/libdladm.so.1</base_include>
+			<base_include type="file">lib/libinetutil.so.1</base_include>
+			<base_include type="file">lib/libkstat.so.1</base_include>
+			<base_include type="file">lib/libofmt.so.1</base_include>
+			<base_include type="file">lib/librcm.so.1</base_include>
+			<base_include type="file">lib/libsec.so.1</base_include>
+			<base_include type="file">lib/libvarpd.so.1</base_include>
+			<base_include type="file">usr/lib/libexacct.so.1</base_include>
+			<base_include type="file">usr/lib/libfcoe.so.1</base_include>
+			<base_include type="file">usr/lib/libidmap.so.1</base_include>
+			<base_include type="file">usr/lib/libidspace.so.1</base_include>
+			<base_include type="file">usr/lib/libpool.so.1</base_include>
+			<base_include type="file">usr/lib/librename.so.1</base_include>
+
+			<!-- libraries for /sbin/ifconfig|/lib/svc/method/net-netmask BugID: #16318-->
+			<base_include type="file">lib/libcmdutils.so.1</base_include>
+			<base_include type="file">lib/libcontract.so.1</base_include>
+			<base_include type="file">lib/libcustr.so.1</base_include>
+			<base_include type="file">lib/libdhcpagent.so.1</base_include>
+			<base_include type="file">lib/libdhcputil.so.1</base_include>
+			<base_include type="file">lib/libdlpi.so.1</base_include>
+			<base_include type="file">lib/libipadm.so.1</base_include>
+			<base_include type="file">lib/libipmp.so.1</base_include>
+			<base_include type="file">lib/libsecdb.so.1</base_include>
+			<base_include type="file">lib/libuuid.so.1</base_include>
+			<base_include type="file">lib/libxnet.so.1</base_include>
+
+			<!-- libraries for /sbin/dladm BugID: #16318-->
+			<base_include type="file">lib/libbsm.so.1</base_include>
+			<base_include type="file">usr/lib/librstp.so.1</base_include>
+			<base_include type="file">usr/lib/libtsol.so.2</base_include>
+
+			<!-- libraries for /usr/bin/bash -->
+			<base_include type="file">usr/lib/64/libncurses.so.5</base_include>
+			<base_include type="file">usr/lib/64/libncurses.so.5.9</base_include>
+
+			<!-- libraries for /usr/bin/cut BugID: #16318-->
+			<base_include type="file">usr/lib/64/libsum.so.1</base_include>
+
+			<!-- libraries for /usr/bin/ps-->
+			<base_include type="file">/lib/64/libavl.so.1</base_include>
+			<base_include type="file">/lib/64/libctf.so.1</base_include>
+			<base_include type="file">/lib/64/libdevinfo.so.1</base_include>
+			<base_include type="file">/lib/64/libdwarf.so.1</base_include>
+			<base_include type="file">/lib/64/libelf.so.1</base_include>
+			<base_include type="file">/lib/64/libgen.so.1</base_include>
+			<base_include type="file">/lib/64/libnvpair.so.1</base_include>
+			<base_include type="file">/lib/64/libproc.so.1</base_include>
+			<base_include type="file">/lib/64/libpthread.so.1</base_include>
+			<base_include type="file">/lib/64/librtld.so.1</base_include>
+			<base_include type="file">/lib/64/libscf.so.1</base_include>
+			<base_include type="file">/lib/64/libsec.so.1</base_include>
+			<base_include type="file">/lib/64/libsecdb.so.1</base_include>
+			<base_include type="file">/lib/64/libsmbios.so.1</base_include>
+			<base_include type="file">/lib/64/libuutil.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libdisasm.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libexacct.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libidmap.so.1</base_include>
+			<base_include type="file">/usr/lib/64/liblzma.so.5</base_include>
+			<base_include type="file">/usr/lib/64/libpool.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libproject.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libsaveargs.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libxml2.so.2</base_include>
+			<base_include type="file">/usr/lib/64/libz.so.1</base_include>
+
+			<!-- libraries for /usr/bin/svcs-->
+			<base_include type="file">/lib/libctf.so.1</base_include>
+			<base_include type="file">/lib/libdwarf.so.1</base_include>
+			<base_include type="file">/lib/libelf.so.1</base_include>
+			<base_include type="file">/lib/libproc.so.1</base_include>
+			<base_include type="file">/lib/librtld_db.so.1</base_include>
+			<base_include type="file">/usr/lib/libbrand.so.1</base_include>
+			<base_include type="file">/usr/lib/libzonecfg.so.1</base_include>
+
+			<!-- libraries for /usr/sbin/format -->
+			<base_include type="file">lib/libadm.so.1</base_include>
+			<base_include type="file">lib/libefi.so.1</base_include>
+			<base_include type="file">lib/libevid.so.1</base_include>
+			<base_include type="file">lib/libsysevent.so.1</base_include>
+			<base_include type="file">usr/lib/libdiskmgt.so.1</base_include>
+			<base_include type="file">usr/lib/libsmbios.so.1</base_include>
+
+			<!-- libraries for /usr/sbin/svccfg -->
+			<base_include type="file">lib/libscf.so.1</base_include>
+			<base_include type="file">lib/libuutil.so.1</base_include>
+			<base_include type="file">lib/libumem.so.1</base_include>
+			<base_include type="file">lib/64/libumem.so.1</base_include>
+			<base_include type="file">lib/libmd5.so.1</base_include>
+			<base_include type="file">lib/libnvpair.so.1</base_include>
+			<base_include type="file">lib/libc.so.1</base_include>
+			<base_include type="file">lib/64/libc.so.1</base_include>
+			<base_include type="file">lib/libpthread.so.1</base_include>
+			<base_include type="file">lib/libm.so.2</base_include>
+			<base_include type="file">lib/64/libm.so.2</base_include>
+			<base_include type="file">lib/libnsl.so.1</base_include>
+			<base_include type="file">lib/64/libnsl.so.1</base_include>
+			<base_include type="file">lib/libgen.so.1</base_include>
+			<base_include type="file">lib/libsocket.so.1</base_include>
+			<base_include type="file">lib/64/libsocket.so.1</base_include>
+			<base_include type="file">lib/libcurses.so.1</base_include>
+			<base_include type="file">lib/libmp.so.2</base_include>
+			<base_include type="file">lib/64/libmp.so.2</base_include>
+			<base_include type="file">lib/libmd.so.1</base_include>
+			<base_include type="file">lib/64/libmd.so.1</base_include>
+			<base_include type="file">usr/lib/libxml2.so.2</base_include>
+			<base_include type="file">usr/lib/libl.so.1</base_include>
+			<base_include type="file">usr/lib/libtecla.so.1</base_include>
+			<base_include type="file">usr/lib/liblzma.so.5</base_include>
+
+			<!-- 
+			     Files which have to be left uncompressed in boot archive.
+			-->
+			<base_include type="file" fiocompress="false">etc/svc/repository.db</base_include>
+			<base_include type="file" fiocompress="false">etc/dev/.devfsadm_dev.lock</base_include>
+			<base_include type="file" fiocompress="false">etc/name_to_major</base_include>
+			<base_include type="file" fiocompress="false">etc/minor_perm</base_include>
+			<base_include type="file" fiocompress="false">etc/driver_aliases</base_include>
+			<base_include type="file" fiocompress="false">etc/driver_classes</base_include>
+			<base_include type="file" fiocompress="false">etc/path_to_inst</base_include>
+			<base_include type="file" fiocompress="false">etc/default/init</base_include>
+			<base_include type="file" fiocompress="false">etc/nsswitch.conf</base_include>
 		</boot_archive_contents>
 	</img_params>
 	<key_value_pairs>
diff --git a/usr/src/cmd/distro_const/text_install/text_mode_x86_minimal.xml b/usr/src/cmd/distro_const/text_install/text_mode_x86_minimal.xml
index 32d5fe74..cfcb2ac1 100644
--- a/usr/src/cmd/distro_const/text_install/text_mode_x86_minimal.xml
+++ b/usr/src/cmd/distro_const/text_install/text_mode_x86_minimal.xml
@@ -99,6 +99,11 @@
 						".textinstall"
 					</argslist>
 				</script>
+				<script name="/usr/share/distro_const/boot_archive_conpress_usr">
+					<checkpoint
+						name="ba-usrtar"
+						message="Boot archive compress /usr"/>
+				</script>
 				<script name="/usr/share/distro_const/boot_archive_archive.py">
 					<checkpoint
 						name="ba-arch"
@@ -303,108 +308,108 @@
 		     must exist in the pkg_image area.
 		-->
 		<boot_archive_contents>
-			<base_include type="file">usr/bin/nawk</base_include>
-			<base_include type="file">usr/bin/mkdir</base_include>
-			<base_include type="file">usr/bin/cp</base_include>
-			<base_include type="file">usr/bin/sed</base_include>
-			<base_include type="file">usr/bin/sort</base_include>
-			<base_include type="file">usr/bin/amd64/sort</base_include>
-			<base_include type="file">usr/bin/i86/sort</base_include>
-			<base_include type="file">usr/bin/pkill</base_include>
-			<base_include type="file">usr/sbin/svcadm</base_include>
-			<base_include type="file">usr/sbin/svccfg</base_include>
-			<base_include type="file">usr/sbin/prtconf</base_include>
-			<base_include type="file">usr/sbin/amd64/prtconf</base_include>
-			<base_include type="file">usr/sbin/i86/prtconf</base_include>
-			<base_include type="file">usr/sbin/nwamcfg</base_include>
-			<base_include type="file">usr/sbin/nwamadm</base_include>
-
-			<!-- libraries needed by /usr/bin/bash -->
-			<base_include type="file">usr/lib/64/libncurses.so.5</base_include>
-			<base_include type="file">usr/lib/64/libncurses.so.5.9</base_include>
-
-			<!-- libraries needed by /usr/sbin/prtconf -->
-			<base_include type="file">usr/lib/libsmbios.so.1</base_include>
-
-			<!-- libraries needed by /usr/sbin/svccfg -->
-			<base_include type="file">usr/lib/libtecla.so.1</base_include>
-			<base_include type="file">usr/lib/libl.so.1</base_include>
-			<base_include type="file">usr/lib/libexacct.so.1</base_include>
-			<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/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>
-			<base_include type="file">usr/lib/mps/libplc4.so</base_include>
-			<base_include type="file">usr/lib/mps/libnss3.so</base_include>
-			<base_include type="file">usr/lib/mps/libssl3.so</base_include>
-			<base_include type="file">usr/lib/mps/libnssutil3.so</base_include>
-			<base_include type="file">usr/lib/mps/libplds4.so</base_include>
-
-			<base_include type="file">usr/sbin/pmadm</base_include>
-			<base_include type="file">usr/sbin/lofiadm</base_include>
-			<base_include type="file">usr/sbin/devfsadm</base_include>
-			<base_include type="file">usr/sbin/modload</base_include>
-			<base_include type="file">usr/sbin/i86/modload</base_include>
-			<base_include type="file">usr/sbin/mount</base_include>
-			<base_include type="file">usr/sbin/hostconfig</base_include>
-			<base_include type="file">usr/sbin/chroot</base_include>
-			<base_include type="file">usr/sbin/syslogd</base_include>
-			<base_include type="file">usr/bin/coreadm</base_include>
 			<base_include type="file">usr/bin/bash</base_include>
-			<base_include type="file">usr/bin/ksh</base_include>
 			<base_include type="file">usr/bin/cat</base_include>
+			<base_include type="file">usr/bin/cd</base_include>
+			<base_include type="file">usr/bin/cp</base_include>
+			<base_include type="file">usr/bin/coreadm</base_include>
+			<base_include type="file">usr/bin/cut</base_include>
 			<base_include type="file">usr/bin/echo</base_include>
+			<base_include type="file">usr/bin/expr</base_include>
 			<base_include type="file">usr/bin/false</base_include>
+			<base_include type="file">usr/bin/file</base_include>
 			<base_include type="file">usr/bin/grep</base_include>
+			<base_include type="file">usr/bin/i86/ksh</base_include>
+			<base_include type="file">usr/bin/ksh</base_include>
+			<base_include type="file">usr/bin/ldd</base_include>
+			<base_include type="file">usr/bin/less</base_include>
 			<base_include type="file">usr/bin/ls</base_include>
+			<base_include type="file">usr/bin/mkdir</base_include>
+			<base_include type="file">usr/bin/more</base_include>
+			<base_include type="file">usr/bin/nawk</base_include>
+			<base_include type="file">usr/bin/pkill</base_include>
+			<base_include type="file">usr/bin/ps</base_include>
 			<base_include type="file">usr/bin/rm</base_include>
+			<base_include type="file">usr/bin/sed</base_include>
+			<base_include type="file">usr/bin/sleep</base_include>
+			<base_include type="file">usr/bin/sort</base_include>
 			<base_include type="file">usr/bin/svcprop</base_include>
-			<base_include type="file">usr/bin/true</base_include>
-			<base_include type="file">usr/bin/cd</base_include>
+			<base_include type="file">usr/bin/svcs</base_include>
+			<base_include type="file">usr/bin/tail</base_include>
 			<base_include type="file">usr/bin/test</base_include>
-			<base_include type="file">usr/bin/sleep</base_include>
-			<base_include type="file">usr/bin/expr</base_include>
+			<base_include type="file">usr/bin/true</base_include>
 			<base_include type="file">usr/bin/vi</base_include>
+			<base_include type="file">usr/bin/which</base_include>
 			<base_include type="file">usr/has/bin/vi</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_audio_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_cfg_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_disk_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_fssnap_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_ieee1394_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_lofi_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_misc_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_port_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_ramdisk_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_sgen_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_tape_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_usb_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/linkmod/SUNW_zfs_link.so</base_include>
+			<base_include type="file">usr/lib/devfsadm/devfsadmd</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>
+			<base_include type="file">usr/lib/fs/tmpfs/mount</base_include>
 			<base_include type="file">usr/lib/fs/ufs/fstyp</base_include>
 			<base_include type="file">usr/lib/fs/ufs/fstyp.so.1</base_include>
 			<base_include type="file">usr/lib/fs/ufs/mount</base_include>
-			<base_include type="file">usr/lib/libfstyp.so.1</base_include>
-			<base_include type="file">usr/lib/platexec</base_include>
-			<base_include type="file">usr/lib/devfsadm/devfsadmd</base_include>
-			<base_include type="file">usr/lib/libm.so.2</base_include>
-			<base_include type="file">usr/lib/libm.so</base_include>
-			<base_include type="file">usr/lib/libfstyp.so</base_include>
-			<base_include type="file">usr/lib/libz.so</base_include>
-			<base_include type="file">usr/lib/libz.so.1</base_include>
-			<base_include type="file">usr/bin/i86/ksh93</base_include>
 			<base_include type="file">usr/lib/isaexec</base_include>
 			<base_include type="file">usr/lib/libast.so.1</base_include>
+			<base_include type="file">usr/lib/64/libast.so.1</base_include>
 			<base_include type="file">usr/lib/libcmd.so.1</base_include>
+			<base_include type="file">usr/lib/64/libcmd.so.1</base_include>
+			<base_include type="file">usr/lib/libcrypt.so.1</base_include>
 			<base_include type="file">usr/lib/libdll.so.1</base_include>
+			<base_include type="file">usr/lib/64/libdll.so.1</base_include>
+			<base_include type="file">usr/lib/libfstyp.so</base_include>
+			<base_include type="file">usr/lib/libfstyp.so.1</base_include>
+			<base_include type="file">usr/lib/libm.so</base_include>
+			<base_include type="file">usr/lib/libm.so.2</base_include>
+			<base_include type="file">usr/lib/64/libm.so</base_include>
+			<base_include type="file">usr/lib/64/libm.so.2</base_include>
+			<base_include type="file">usr/lib/libmapmalloc.so.1</base_include>
 			<base_include type="file">usr/lib/libshell.so.1</base_include>
+			<base_include type="file">usr/lib/64/libshell.so.1</base_include>
+			<base_include type="file">usr/lib/libz.so</base_include>
+			<base_include type="file">usr/lib/libz.so.1</base_include>
+			<base_include type="file">usr/lib/platexec</base_include>
+			<base_include type="file">usr/sbin/chroot</base_include>
+			<base_include type="file">usr/sbin/devfsadm</base_include>
+			<base_include type="file">usr/sbin/df</base_include>
+			<base_include type="file">usr/sbin/format</base_include>
+			<base_include type="file">usr/sbin/hostconfig</base_include>
+			<base_include type="file">usr/sbin/lofiadm</base_include>
+			<base_include type="file">usr/sbin/modload</base_include>
+			<base_include type="file">usr/sbin/mount</base_include>
+			<base_include type="file">usr/sbin/nwamadm</base_include>
+			<base_include type="file">usr/sbin/nwamcfg</base_include>
+			<base_include type="file">usr/sbin/ping</base_include>
+			<base_include type="file">usr/sbin/pmadm</base_include>
+			<base_include type="file">usr/sbin/prtconf</base_include>
+			<base_include type="file">usr/sbin/prtvtoc</base_include>
+			<base_include type="file">usr/sbin/svcadm</base_include>
+			<base_include type="file">usr/sbin/svccfg</base_include>
+			<base_include type="file">usr/sbin/syslogd</base_include>
 			<base_include type="file">usr/share/lib/xml/dtd/service_bundle.dtd.1</base_include>
-			<base_include type="file">var/sadm/install/admin/default</base_include>
-			<base_include type="file">var/sadm/system/admin/default_java</base_include>
-			<base_include type="file">var/sadm/install/contents</base_include>
 			<base_include type="file">var/adm/utmpx</base_include>
 			<base_include type="file">var/adm/wtmpx</base_include>
 			<base_include type="file">var/adm/aculog</base_include>
-			<base_include type="file">var/lib/postrun/postrun-runq</base_include>
-			<base_include type="file">var/lib/postrun/postrun</base_include>
-			<base_include type="file">var/log/postrun.log</base_include>
 			<base_include type="file">var/log/authlog</base_include>
 			<base_include type="file">var/log/syslog</base_include>
+			<base_include type="file">var/sadm/install/admin/default</base_include>
+			<base_include type="file">var/sadm/install/contents</base_include>
 			<base_include type="file">var/saf/zsmon/log</base_include>
 			<base_include type="file">var/spool/cron/crontabs/adm</base_include>
 			<base_include type="file">var/spool/cron/crontabs/root</base_include>
-			<base_include type="file">var/nis/NIS+LDAPmapping.template</base_include>
 			<base_include type="file">var/yp/aliases</base_include>
 			<base_include type="file">var/yp/nicknames</base_include>
 			<base_include type="dir">kernel</base_include>
@@ -422,11 +427,133 @@
 			<base_include type="dir">var/svc/profile</base_include>
 			<base_include type="dir">var/sadm</base_include>
 			<base_include type="dir">etc</base_include>
-			<base_exclude type="dir">etc/gconf</base_exclude>
-			<base_exclude type="dir">etc/brltty</base_exclude>
-			<base_exclude type="dir">etc/gtk-2.0</base_exclude>
 			<base_exclude type="dir">etc/notices</base_exclude>
 			<base_exclude type="dir">var/sadm/pkg</base_exclude>
+
+			<!-- libraries for /lib/svc/method/svc-fcoei BugID: #16318-->
+			<base_include type="file">lib/libavl.so.1</base_include>
+			<base_include type="file">lib/libdevinfo.so.1</base_include>
+			<base_include type="file">lib/libdladm.so.1</base_include>
+			<base_include type="file">lib/libinetutil.so.1</base_include>
+			<base_include type="file">lib/libkstat.so.1</base_include>
+			<base_include type="file">lib/libofmt.so.1</base_include>
+			<base_include type="file">lib/librcm.so.1</base_include>
+			<base_include type="file">lib/libsec.so.1</base_include>
+			<base_include type="file">lib/libvarpd.so.1</base_include>
+			<base_include type="file">usr/lib/libexacct.so.1</base_include>
+			<base_include type="file">usr/lib/libfcoe.so.1</base_include>
+			<base_include type="file">usr/lib/libidmap.so.1</base_include>
+			<base_include type="file">usr/lib/libidspace.so.1</base_include>
+			<base_include type="file">usr/lib/libpool.so.1</base_include>
+			<base_include type="file">usr/lib/librename.so.1</base_include>
+
+			<!-- libraries for /sbin/ifconfig|/lib/svc/method/net-netmask BugID: #16318-->
+			<base_include type="file">lib/libcmdutils.so.1</base_include>
+			<base_include type="file">lib/libcontract.so.1</base_include>
+			<base_include type="file">lib/libcustr.so.1</base_include>
+			<base_include type="file">lib/libdhcpagent.so.1</base_include>
+			<base_include type="file">lib/libdhcputil.so.1</base_include>
+			<base_include type="file">lib/libdlpi.so.1</base_include>
+			<base_include type="file">lib/libipadm.so.1</base_include>
+			<base_include type="file">lib/libipmp.so.1</base_include>
+			<base_include type="file">lib/libsecdb.so.1</base_include>
+			<base_include type="file">lib/libuuid.so.1</base_include>
+			<base_include type="file">lib/libxnet.so.1</base_include>
+
+			<!-- libraries for /sbin/dladm BugID: #16318-->
+			<base_include type="file">lib/libbsm.so.1</base_include>
+			<base_include type="file">usr/lib/librstp.so.1</base_include>
+			<base_include type="file">usr/lib/libtsol.so.2</base_include>
+
+			<!-- libraries for /usr/bin/bash -->
+			<base_include type="file">usr/lib/64/libncurses.so.5</base_include>
+			<base_include type="file">usr/lib/64/libncurses.so.5.9</base_include>
+
+			<!-- libraries for /usr/bin/cut BugID: #16318-->
+			<base_include type="file">usr/lib/64/libsum.so.1</base_include>
+
+			<!-- libraries for /usr/bin/ps-->
+			<base_include type="file">/lib/64/libavl.so.1</base_include>
+			<base_include type="file">/lib/64/libctf.so.1</base_include>
+			<base_include type="file">/lib/64/libdevinfo.so.1</base_include>
+			<base_include type="file">/lib/64/libdwarf.so.1</base_include>
+			<base_include type="file">/lib/64/libelf.so.1</base_include>
+			<base_include type="file">/lib/64/libgen.so.1</base_include>
+			<base_include type="file">/lib/64/libnvpair.so.1</base_include>
+			<base_include type="file">/lib/64/libproc.so.1</base_include>
+			<base_include type="file">/lib/64/libpthread.so.1</base_include>
+			<base_include type="file">/lib/64/librtld.so.1</base_include>
+			<base_include type="file">/lib/64/libscf.so.1</base_include>
+			<base_include type="file">/lib/64/libsec.so.1</base_include>
+			<base_include type="file">/lib/64/libsecdb.so.1</base_include>
+			<base_include type="file">/lib/64/libsmbios.so.1</base_include>
+			<base_include type="file">/lib/64/libuutil.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libdisasm.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libexacct.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libidmap.so.1</base_include>
+			<base_include type="file">/usr/lib/64/liblzma.so.5</base_include>
+			<base_include type="file">/usr/lib/64/libpool.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libproject.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libsaveargs.so.1</base_include>
+			<base_include type="file">/usr/lib/64/libxml2.so.2</base_include>
+			<base_include type="file">/usr/lib/64/libz.so.1</base_include>
+
+			<!-- libraries for /usr/bin/svcs-->
+			<base_include type="file">/lib/libctf.so.1</base_include>
+			<base_include type="file">/lib/libdwarf.so.1</base_include>
+			<base_include type="file">/lib/libelf.so.1</base_include>
+			<base_include type="file">/lib/libproc.so.1</base_include>
+			<base_include type="file">/lib/librtld_db.so.1</base_include>
+			<base_include type="file">/usr/lib/libbrand.so.1</base_include>
+			<base_include type="file">/usr/lib/libzonecfg.so.1</base_include>
+
+			<!-- libraries for /usr/sbin/format -->
+			<base_include type="file">lib/libadm.so.1</base_include>
+			<base_include type="file">lib/libefi.so.1</base_include>
+			<base_include type="file">lib/libevid.so.1</base_include>
+			<base_include type="file">lib/libsysevent.so.1</base_include>
+			<base_include type="file">usr/lib/libdiskmgt.so.1</base_include>
+			<base_include type="file">usr/lib/libsmbios.so.1</base_include>
+
+			<!-- libraries for /usr/sbin/svccfg -->
+			<base_include type="file">lib/libscf.so.1</base_include>
+			<base_include type="file">lib/libuutil.so.1</base_include>
+			<base_include type="file">lib/libumem.so.1</base_include>
+			<base_include type="file">lib/64/libumem.so.1</base_include>
+			<base_include type="file">lib/libmd5.so.1</base_include>
+			<base_include type="file">lib/libnvpair.so.1</base_include>
+			<base_include type="file">lib/libc.so.1</base_include>
+			<base_include type="file">lib/64/libc.so.1</base_include>
+			<base_include type="file">lib/libpthread.so.1</base_include>
+			<base_include type="file">lib/libm.so.2</base_include>
+			<base_include type="file">lib/64/libm.so.2</base_include>
+			<base_include type="file">lib/libnsl.so.1</base_include>
+			<base_include type="file">lib/64/libnsl.so.1</base_include>
+			<base_include type="file">lib/libgen.so.1</base_include>
+			<base_include type="file">lib/libsocket.so.1</base_include>
+			<base_include type="file">lib/64/libsocket.so.1</base_include>
+			<base_include type="file">lib/libcurses.so.1</base_include>
+			<base_include type="file">lib/libmp.so.2</base_include>
+			<base_include type="file">lib/64/libmp.so.2</base_include>
+			<base_include type="file">lib/libmd.so.1</base_include>
+			<base_include type="file">lib/64/libmd.so.1</base_include>
+			<base_include type="file">usr/lib/libxml2.so.2</base_include>
+			<base_include type="file">usr/lib/libl.so.1</base_include>
+			<base_include type="file">usr/lib/libtecla.so.1</base_include>
+			<base_include type="file">usr/lib/liblzma.so.5</base_include>
+
+			<!-- 
+			     Files which have to be left uncompressed in boot archive.
+			-->
+			<base_include type="file" fiocompress="false">etc/svc/repository.db</base_include>
+			<base_include type="file" fiocompress="false">etc/dev/.devfsadm_dev.lock</base_include>
+			<base_include type="file" fiocompress="false">etc/name_to_major</base_include>
+			<base_include type="file" fiocompress="false">etc/minor_perm</base_include>
+			<base_include type="file" fiocompress="false">etc/driver_aliases</base_include>
+			<base_include type="file" fiocompress="false">etc/driver_classes</base_include>
+			<base_include type="file" fiocompress="false">etc/path_to_inst</base_include>
+			<base_include type="file" fiocompress="false">etc/default/init</base_include>
+			<base_include type="file" fiocompress="false">etc/nsswitch.conf</base_include>
 		</boot_archive_contents>
 	</img_params>
 	<key_value_pairs>
diff --git a/usr/src/cmd/distro_const/utils/Makefile b/usr/src/cmd/distro_const/utils/Makefile
index b11d02f0..b5943dc1 100644
--- a/usr/src/cmd/distro_const/utils/Makefile
+++ b/usr/src/cmd/distro_const/utils/Makefile
@@ -48,6 +48,7 @@ DC_UTIL_FILES=	mkrepo \
 		create_usb \
 		gen_cd_content \
 		boot_archive_configure \
+		boot_archive_compress_usr \
 		post_boot_archive_pkg_image_mod \
 		post_boot_archive_pkg_image_mod_custom \
 		generic_live.xml \
diff --git a/usr/src/cmd/distro_const/utils/boot_archive_compress_usr b/usr/src/cmd/distro_const/utils/boot_archive_compress_usr
new file mode 100755
index 00000000..b96794e8
--- /dev/null
+++ b/usr/src/cmd/distro_const/utils/boot_archive_compress_usr
@@ -0,0 +1,270 @@
+#!/usr/bin/ksh
+#
+# 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 2025 Klaus Ziegler. All rights reserved.
+#
+
+# =============================================================================
+# =============================================================================
+# sparc_usb_confiure - Configure a populated boot archive area including usr
+#			and misc filesystems into a usable boot archive.
+# =============================================================================
+# =============================================================================
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Main
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Configure a populated boot archive area into a usable boot archive, less archiving.
+# 
+# Args:
+#   MFEST_SOCKET: Socket needed to get manifest data via ManifestRead object
+#
+#   PKG_IMG_PATH: Package image area
+#
+#   TMP_DIR: Temporary directory to contain the boot archive file
+#
+#   BA_BUILD: Area where boot archive is put together.
+#
+#   MEDIA_DIR: Area where the media is put. (Not used)
+#
+# Note: This assumes a populated boot archive area exists at $BA_BUILD.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Verify argument count
+if [ $# != 5 ] ; then
+	print -u2 -f "%s: Requires 5 args: Reader socket, pkg_image area,\n" \
+	    "$0"
+	print -u2 "    tmp dir, boot archive build area, media area,"
+	print -u2 "    img_type_file."
+	exit 1
+fi
+
+# Get commandline args.  First 5 are passed to all finalizer scripts.
+MFEST_SOCKET=$1
+PKG_IMG_PATH=$2
+if [ ! -d $PKG_IMG_PATH ] ; then
+	print -u2 -f "%s: Image package area %s is not valid\n" \
+	    "$0" "$PKG_IMG_PATH"
+	exit 1
+fi
+
+TMP_DIR=$3
+if [ ! -d $TMP_DIR ] ; then
+	print -u2 -f "%s: Temporary area %s is not valid\n" "$0" "$TMP_DIR"
+	exit 1
+fi
+
+BA_BUILD=$4
+if [ ! -d $BA_BUILD ] ; then
+	print -u2 -f "%s: Boot archive build area is not valid\n" "$0"
+	exit 1
+fi
+
+builtin cd
+builtin rm
+builtin mkdir
+builtin mv
+
+# Define a few commands.
+CHGRP=/usr/bin/chgrp
+CHOWN=/usr/bin/chown
+GREP=/usr/bin/grep
+LOFIADM=/usr/sbin/lofiadm
+MKISOFS=/usr/bin/mkisofs
+TIME=/usr/bin/time
+
+# Define non-core-OS commands.
+MANIFEST_READ=/usr/bin/ManifestRead
+
+# Note that DIST_ISO_SORT may or may not exist, given the type of image.
+DIST_ISO_SORT=$($MANIFEST_READ -k $MFEST_SOCKET "iso_sort")
+
+if [ ! -d $PKG_IMG_PATH ] ; then
+	print -u2 -f "%s: Image package area %s is not valid\n" \
+	    "$0" "$PKG_IMG_PATH"
+	exit 1
+fi
+
+cd $PKG_IMG_PATH
+
+# check package dependencies for perl, a combined / and /usr image
+# with two perl version, will simply be to big to be booted.
+PVERS=`(cd usr/perl5; ls -1 | sed \
+	-e "/bin/d" \
+	-e "/man/d" \
+	-e "/pod/d" \
+	-e "/site_perl/d" \
+	-e "/vendor_perl/d" | wc -l | awk '{print $1}')`
+if [ "$PVERS" -ne 1 ]; then
+	print -u2 -f "%s: Image package area %s contains more than one Perl-Version\n" \
+	    "$0" "$PKG_IMG_PATH"
+	exit 1
+fi
+
+# sbin, kernel and lib are all in the root archive
+print "Removing sbin, kernel and lib from package image area"
+rm -rf sbin kernel lib tmp/tmp_*
+
+# before we can compress /usr we need to save some essential
+# things needed for the installer.
+cd ${PKG_IMG_PATH}/usr
+# keyboard
+mv share/lib/keytables ..
+# terminal
+mv share/lib/terminfo ..
+# time
+mv share/lib/zoneinfo ..
+# needed to intialize SMF
+mv share/lib/xml ..
+# hal SMF services needs dbus
+mv share/dbus-1 ..
+
+D2REM="apache2 apr apr-util ddu demo dict games gnu/share has kvm mail"
+D2REM="$D2REM man net news old openssl/3/share perl5 preserve proc"
+D2REM="$D2REM pub sfw share spool src X11 lib/p7zip lib/iconv"
+
+for d in $D2REM
+do
+	[ -d $d ] && printf "$d " >> /tmp/boot_archive_compress_usr.$$
+done
+
+# also append libicu libs to be removed much too big.
+echo "lib/64/libicu*" >> /tmp/boot_archive_compress_usr.$$
+
+/usr/bin/gtar cf usr.tar `cat /tmp/boot_archive_compress_usr.$$`
+
+# now clear out usr.
+rm -rf `cat /tmp/boot_archive_compress_usr.$$`
+rm /tmp/boot_archive_compress_usr.$$
+
+print "Compressing usr directories using lzma compression"
+xz -9 usr.tar
+if [ $? -ne 0 ] ; then
+	print -u2 -f "%s: compression of usr directories failed\n" "$0"
+	exit 1	
+fi
+# copy our SPARC text-install script...
+cp -p /ws/oi-userland/text-mode-menu ${PKG_IMG_PATH}/usr/sbin
+cp -p /ws/oi-userland/text-install ${BA_BUILD}/sbin
+cp -p /usr/bin/resize ${BA_BUILD}/sbin
+$CHOWN root:bin ${BA_BUILD}/sbin/text-install
+$CHOWN root:bin ${PKG_IMG_PATH}/usr/sbin/text-mode-menu
+mv usr.tar.xz ${BA_BUILD}/.usr.tar.xz
+mkdir -p share/lib
+$CHGRP sys share
+$CHGRP sys share/lib
+$CHGRP bin include
+mv ../dbus-1 share
+mv ../keytables share/lib
+mv ../terminfo share/lib
+mv ../xml share/lib
+mv ../zoneinfo share/lib
+
+cd $PKG_IMG_PATH
+
+# sbin, kernel and lib are all in the root archive
+print "Removing sbin, kernel and lib from package image area"
+rm -rf sbin kernel lib tmp/tmp_*
+
+print "Generating usr filesystem image"
+if [ ! -d $PKG_IMG_PATH ] ; then
+	print -u2 -f "%s: Image package area %s is not valid\n" \
+	    "$0" "$PKG_IMG_PATH"
+	exit 1
+fi
+
+if [[ "X${DIST_ISO_SORT}" != "X" && -s "${DIST_ISO_SORT}" ]]; then
+	SORT_OPTION="-sort $DIST_ISO_SORT"
+	print "Sorting according to $DIST_ISO_SORT"
+else
+	SORT_OPTION=""
+fi
+
+$MKISOFS -o solaris.zlib $SORT_OPTION -quiet -N -l -R \
+    -U -allow-multidot -no-iso-translate -cache-inodes \
+    -d -D -V "compress" usr
+
+if [ $? -ne 0 ] ; then
+	print -u2 -f "%s: mkisofs of solaris failed\n" "$0"
+	exit 1	
+fi
+
+print "Confirm lofiadm is available in image..."
+if [ ! -f ${PKG_IMG_PATH}${LOFIADM} ] ; then
+	print -u2 -f "%s: %s%s NOT FOUND\n" "$0" "${PKG_IMG_PATH}" "${LOFIADM}"
+	exit 1
+fi
+
+LOFI_OUT_STR=${TMP_DIR}/lofi_out_str.$$
+
+USER_ZLIB_ALG=lzma
+print "Compressing usr filesystem image using compression algorithm: ${USER_ZLIB_ALG}"
+LD_LIBRARY_PATH=${PKG_IMG_PATH}/usr/lib $TIME ${PKG_IMG_PATH}/${LOFIADM} \
+    -C ${USER_ZLIB_ALG} ${PKG_IMG_PATH}/solaris.zlib >/dev/null \
+    2>$LOFI_OUT_STR
+if [ $? -ne 0 ] ; then
+	$GREP "invalid algorithm name" $LOFI_OUT_STR
+	if [ $? -eq 0 ] ; then
+		print -u2 -f "%s: %s is an invalid lofiadm algorithm\n." \
+		    "$0" "${USER_ZLIB_ALG}"
+		print -u2 "Please modify your USER_ZLIB_ALG parameter."
+		rm $LOFI_OUT_STR
+		exit 1
+	fi
+	rm $LOFI_OUT_STR
+	print -u2 -f "%s: compression of usr filesystem failed\n" "$0"
+	exit 1	
+fi
+rm $LOFI_OUT_STR
+mv ${PKG_IMG_PATH}/solaris.zlib ${BA_BUILD}
+
+print "Generating misc filesystem image"
+if [ ! -d $PKG_IMG_PATH ] ; then
+	print -u2 -f "%s: Image package area %s is not valid\n" \
+	    "$0" "$PKG_IMG_PATH"
+	exit 1
+fi
+cd $PKG_IMG_PATH
+mkdir miscdirs
+mv opt miscdirs
+mv etc miscdirs
+mv var miscdirs
+$MKISOFS -o solarismisc.zlib -N -l -R -U -allow-multidot \
+    -no-iso-translate \
+    -quiet -cache-inodes -d -D -V "compress" miscdirs
+if [ "$?" != "0" ] ; then
+	print -u2 -f "%s: mkisofs of solarismisc failed\n" "$0"
+	exit 1	
+fi
+rm -rf miscdirs
+
+COMPRESSION_TYPE=lzma
+print "Compressing misc filesystem image using compression algorithm: ${COMPRESSION_TYPE}"
+LD_LIBRARY_PATH=${PKG_IMG_PATH}/usr/lib $TIME ${PKG_IMG_PATH}${LOFIADM} \
+    -C $COMPRESSION_TYPE ${PKG_IMG_PATH}/solarismisc.zlib >/dev/null 2>&1
+if [ "$?" != "0" ] ; then
+	print -u2 -f "%s: compression of solarismisc failed\n" "$0"
+	exit 1	
+fi
+mv ${PKG_IMG_PATH}/solarismisc.zlib ${BA_BUILD}
+
+exit 0
diff --git a/usr/src/cmd/distro_const/utils/post_boot_archive_pkg_image_mod b/usr/src/cmd/distro_const/utils/post_boot_archive_pkg_image_mod
index eac2bc04..b9fff651 100755
--- a/usr/src/cmd/distro_const/utils/post_boot_archive_pkg_image_mod
+++ b/usr/src/cmd/distro_const/utils/post_boot_archive_pkg_image_mod
@@ -102,6 +102,11 @@ if [ ! -d ${BA_BUILD} ] ; then
 	exit 1
 fi
 
+if [  -f ${BA_BUILD}/.usr.tar.xz ] ; then
+	rm -rf ${PKG_IMG_PATH}/usr
+	exit 0
+fi
+
 # Copying volsetid to live CD root		
 cp ${BA_BUILD}/.volsetid ${PKG_IMG_PATH}
 
@@ -137,7 +142,7 @@ DIST_ISO_SORT=$($MANIFEST_READ -k $MFEST_SOCK "iso_sort")
 # package installation; if left in place it becomes a symlink
 # into /mnt/misc which will cause the installer's attempt to
 # create a user account to fail
-rm ${PKG_IMG_PATH}/etc/.pwd.lock
+rm -f ${PKG_IMG_PATH}/etc/.pwd.lock
 
 if [ ! -d $PKG_IMG_PATH ] ; then
 	print -u2 -f "%s: Image package area %s is not valid\n" \
diff --git a/usr/src/cmd/slim-install/svc/live_fs_include.sh b/usr/src/cmd/slim-install/svc/live_fs_include.sh
index 575bf71a..e807694e 100644
--- a/usr/src/cmd/slim-install/svc/live_fs_include.sh
+++ b/usr/src/cmd/slim-install/svc/live_fs_include.sh
@@ -140,10 +140,10 @@ update_linker_cache()
 	if [ -f /etc/crle.conf ]
 	then
 
-		PATH=/usr/foss/bin:/usr/foss/firefox/bin:/usr/foss/thunderbird/bin:/sbin:/usr/sbin:/usr/bin:/usr/ccs/bin:/usr/X11R6/bin:/opt/DTT/bin
+		PATH=/sbin:/usr/sbin:/usr/bin:/usr/ccs/bin:/usr/X11R6/bin:/opt/DTT/bin
 		export PATH
 
-		LD_LIBRARY_PATH=/usr/foss/lib:/lib:/usr/lib:/usr/sfw/lib:/usr/X11R6/lib
+		LD_LIBRARY_PATH=/lib:/usr/lib:/usr/sfw/lib:/usr/X11R6/lib
 		export LD_LIBRARY_PATH
 
 		. /etc/crle.conf
diff --git a/usr/src/cmd/slim-install/svc/media-fs-root b/usr/src/cmd/slim-install/svc/media-fs-root
index 5195afc8..45bfbed1 100644
--- a/usr/src/cmd/slim-install/svc/media-fs-root
+++ b/usr/src/cmd/slim-install/svc/media-fs-root
@@ -43,14 +43,30 @@ TEXTINSTALL=0
 [ -f /.autoinstall ] && AUTOINSTALL=1
 [ -f /.textinstall ] && TEXTINSTALL=1
 
+#
+# Set up the terminal correctly for prompting
+#
+CPU=`/usr/bin/uname -p` 
+if [ "$CPU" = i386 ] && [ $LIVECD = 1 ]; then
+	TERM=sun-color
+elif [ "$CPU" = sparc ] && [ $LIVECD = 1 ]; then
+	TERM=sun
+else
+	TERM=xterm
+fi
+export TERM
+if [ "$TERM" = xterm ] && [ -x /sbin/resize ]; then
+	/sbin/resize
+fi
+
 PRTCONF=/usr/sbin/prtconf
 SED=/usr/bin/sed
 CUT=/usr/bin/cut
 MOUNT=/sbin/mount
 
 # compressed archives
-SOLARIS_ZLIB="solaris.zlib"
-SOLARISMISC_ZLIB="solarismisc.zlib"
+SOLARIS_ZLIB="/.cdrom/solaris.zlib"
+SOLARISMISC_ZLIB="/.cdrom/solarismisc.zlib"
 
 . /lib/svc/share/live_fs_include.sh
 . /lib/svc/share/smf_include.sh
@@ -80,11 +96,12 @@ do
 	fi
 	if [ $? -eq 0 ]; then
 		$MOUNT -F $FSTYP -o $OPTIONS $dev /.cdrom || break
-		if [[ "$volsetid" != "$( < "/.cdrom/.volsetid" )" ]]; then
+		[ -f /.cdrom/.volsetid ] && cdvolsetid=$( < "/.cdrom/.volsetid" )
+		if [ "$volsetid" != "$cdvolsetid" ]; then
 			/sbin/umount -f $dev
 			continue
 		fi
-		if [ -f /.cdrom/$SOLARIS_ZLIB ]; then
+		if [ -f $SOLARIS_ZLIB ]; then
 			echo "" > /.liveusb
 			break
 		else
@@ -110,7 +127,7 @@ do
 done
 
 # ... else try network (NFS)
-if ! $MOUNT | grep -q "^/.cdrom" ; then
+if [ ! $MOUNT | grep -q "^/.cdrom" ] || [ ! -f /.liveusb ]; then
 	# Wait up to 60 seconds until network is up
 	RETRIES=0
 	until
@@ -147,52 +164,61 @@ if ! $MOUNT | grep -q "^/.cdrom" ; then
 	fi
 fi
 
-# Check if mount of /.cdrom failed.
-$MOUNT | grep "^/.cdrom"
-if [ $? -ne 0 ]; then
-	echo "** FATAL **: Unable to access media"
-	exit $SMF_EXIT_ERR_FATAL
+# copy the compressed zlibs to /tmp for single device illumos stream install.
+if [ ! -f /.cdrom/solaris.zlib ]; then
+	SOLARIS_ZLIB="/tmp/solaris.zlib"
+	SOLARISMISC_ZLIB="/tmp/solarismisc.zlib"
+	$MOUNT /tmp
+	cp /solaris.zlib /tmp
+	cp /solarismisc.zlib /tmp
 fi
 
 # Explictly create lofi devices for solaris.zlib and 
 # solarismisc.zlib
-
-
 #
 # Can not mount solaris.zlib using just the mount command,
 # because the mount command enforces nosetuid, and /usr
 # needs to have the setuid capability.
 #
-#
 # Must use lofiadm in combination with the mount command,
 # as with the changes to make lofi work from within a zone,
 # a properly populated /dev tree is required to use simply
 # "mount" - this applies to both .zlib files.
 #
-usr_lofi_dev=$(/usr/sbin/lofiadm -a /.cdrom/$SOLARIS_ZLIB)
+usr_lofi_dev=$(/usr/sbin/lofiadm -a $SOLARIS_ZLIB)
 if [ $? -ne 0 -o -z "$usr_lofi_dev" ]; then
-	echo "lofiadm of /usr FAILED!" 
+	echo "lofiadm of /usr FAILED!" > /dev/msglog
 	exit $SMF_EXIT_ERR_FATAL
 fi
 $MOUNT -F hsfs -o ro ${usr_lofi_dev} /usr
 if [ $? -ne 0 ]; then
-	echo "/usr MOUNT FAILED!" 
+	echo "/usr MOUNT FAILED!" > /dev/msglog
 	exit $SMF_EXIT_ERR_FATAL
 fi
 
 
-misc_lofi_dev=$(/usr/sbin/lofiadm -a /.cdrom/$SOLARISMISC_ZLIB)
+misc_lofi_dev=$(/usr/sbin/lofiadm -a $SOLARISMISC_ZLIB)
 if [ $? -ne 0 -o -z "$misc_lofi_dev" ]; then
-	echo "lofiadm of /mnt/misc FAILED!"
+	echo "lofiadm of /mnt/misc FAILED!" > /dev/msglog
 	exit $SMF_EXIT_ERR_FATAL
 fi
 
 $MOUNT -F hsfs -o ro ${misc_lofi_dev} /mnt/misc
 if [ $? -ne 0 ]; then
-	echo "/mnt/misc MOUNT FAILED!"
+	echo "/mnt/misc MOUNT FAILED!" > /dev/msglog
 	exit $SMF_EXIT_ERR_FATAL
 fi
 
+# Check if mount of /.cdrom failed.
+if [ ! /.usr.tar.xz ]; then
+	$MOUNT | grep "^/.cdrom"
+	if [ $? -ne 0 ]; then
+		echo "** FATAL **: Unable to access media" > /dev/msglog
+		exit $SMF_EXIT_ERR_FATAL
+	fi
+fi
+
+
 if [ $LIVECD = 1 ]; then
 	echo "Done mounting Live image" > /dev/msglog
 elif [ $AUTOINSTALL = 1 ]; then
@@ -201,6 +227,17 @@ elif [ $TEXTINSTALL = 1 ]; then
 	echo "Done mounting text install image" > /dev/msglog
 fi
 
+# now after the lofi filesystems are active, get rid of
+# the ones in the actual root filesystem.
+if [ -f /.usr.tar.xz ]; then
+	rm -f /solaris.zlib
+	rm -f /solarismisc.zlib
+	if [ -f /.cdrom/solaris.zlib ]; then
+		rm /tmp/solarismisc.zlib
+		rm /tmp/solaris.zlib
+	fi
+fi
+
 #
 # Also mount /boot now so that things like keymap.sh can access
 # boot properties through eeprom.  Readonly isn't required because
@@ -287,12 +324,6 @@ if [ $AUTOINSTALL = 1 ]; then
 		/usr/sbin/svcadm enable network/ssh
 	fi
 elif [ $LIVECD = 1 ]; then
-	#
-	# Set up the terminal correctly for prompting
-	#
-	TERM=sun-color
-	export TERM
-
 	#
 	# if requested via GRUB menu selection:
 	#     enable ssh
@@ -334,9 +365,21 @@ elif [ $LIVECD = 1 ]; then
 
 elif [ $TEXTINSTALL = 1 ]
 then
-	# Get keyboard layout from user.
-	/usr/bin/kbd -s </dev/console >/dev/console 2>&1
-	/usr/sbin/set_lang </dev/console >/dev/console 2>&1
+	# Check if we have a self identifying keyboard type - usually only on SPARC systems.
+	KBTYP=`/usr/bin/kbd -t`
+	case $KBTYP in
+		Type*) echo "Using: ${KBTYP}." > /dev/msglog
+		;;
+		*) # Get keyboard layout from user.
+			/usr/bin/kbd -s </dev/console >/dev/console 2>&1
+		;;
+	esac
+	# check if created boot-image has additional languages,
+	# if not then we don't have to ask this question.
+	ALLLANG=`ls /usr/lib/locale | wc -w | awk '{print $1}'`
+	if [ "$ALLLANG" -ge 30 ]; then
+		/usr/sbin/set_lang </dev/console >/dev/console 2>&1
+	fi
 fi
 
 exit $SMF_EXIT_OK
diff --git a/usr/src/cmd/text-install/svc/Makefile b/usr/src/cmd/text-install/svc/Makefile
index c25707f7..b6a871ac 100644
--- a/usr/src/cmd/text-install/svc/Makefile
+++ b/usr/src/cmd/text-install/svc/Makefile
@@ -34,10 +34,13 @@ install:=	TARGET= install
 PROG_KSH=	text-mode-menu.ksh
 PROG=		$(PROG_KSH:%.ksh=%)
 
+INSTALLER_KSH=	text-install.ksh
+INSTALLER=	$(INSTALLER_KSH:%.ksh=%)
+
 MSG_DOMAIN=	SUNW_INSTALL_TEXT_MENU
 POFILE=		$(MSG_DOMAIN).po
 
-ROOTPROGS=      $(PROG:%=$(ROOTUSRSBIN)/%)
+ROOTPROGS=      $(PROG:%=$(ROOTUSRSBIN)/%) $(INSTALLER:%=$(ROOTSBIN)/%)
 $(ROOTPROGS) :=	FILEMODE = 0555
 ROOTMSGS=	$(POFILE:%=$(ROOTUSRLIBMSGS)/%)
 
diff --git a/usr/src/cmd/text-install/svc/text-install.ksh b/usr/src/cmd/text-install/svc/text-install.ksh
new file mode 100755
index 00000000..418a532a
--- /dev/null
+++ b/usr/src/cmd/text-install/svc/text-install.ksh
@@ -0,0 +1,1304 @@
+#!/bin/ksh
+#
+# plain text installer for modern SunOS distributions,
+# not suitable for SunOS 4.x, or older.
+#
+# Copyright (c) 2026 Klaus Ziegler
+#
+# netmask validation/function by Olaf Bohlen Oct 2025
+
+trap 'rm -f /tmp/*zpool.log /tmp/ztemp.log; exit' 0 1 2 15
+
+# set platform we are on.
+ARCH=`uname -p`
+
+select_timezone()
+{
+  if [ $1 != GMT ]; then
+    ls /usr/share/lib/zoneinfo/$1 >/tmp/tzlist.$$
+    LINES=`/usr/bin/awk 'END {print NR}' /tmp/tzlist.$$`
+    /usr/bin/awk '{printf "%3d. %s\n", NR, $0}' /tmp/tzlist.$$ | pr -t -4
+    /usr/bin/awk '{print NR ".", $0}' /tmp/tzlist.$$ >/tmp/tzlist
+    printf "\n\tplease select (1-$LINES): "
+    read LINE
+    COUNTRY=`/usr/bin/grep "^${LINE}. " /tmp/tzlist | /usr/bin/awk '{print $2}'`
+    CHECK=`/usr/bin/grep -c "^${LINE}. " /tmp/tzlist`
+    if [ $CHECK -eq 0 ]; then
+      print "\n\t\tInvalid country - please try again!"
+      echo
+    else
+      printf "\nSelected: ${1}/${COUNTRY}: "
+      return $COUNTRY
+      rm /tmp/tzlist*
+      break
+    fi
+  else
+    printf "\nSelected: ${1}: "
+    CHECK=1
+  fi
+}
+
+# function to convert EFI into SMI disk-labels.
+smilabel()
+{
+  echo "l" >/tmp/smilabel
+  echo "0" >>/tmp/smilabel
+  echo "" >>/tmp/smilabel
+  echo "" >>/tmp/smilabel
+  echo "q" >>/tmp/smilabel
+  format -f /tmp/smilabel -e $1 >/dev/null 2>/dev/null
+}
+
+# currently on SPARC, the zpool command dumps core, if trying
+# to create zpools on a EFI labeld disk - therefore EFI labels
+# aren't supported on SPARC atm.
+validate_disk()
+{
+  print "\n\tChecking disk(s)..."
+  case $1 in
+    [0-9],[0-9])
+      dchk1=`echo $1 | awk -F, '{print $1}'`
+      dchk2=`echo $1 | awk -F, '{print $2}'`
+      disk=`/usr/bin/awk '/ '"$dchk1"'\./ {print $2}' /tmp/dsk.log`
+      mirror=`/usr/bin/awk '/ '"$dchk2"'\./ {print $2}' /tmp/dsk.log`
+    ;;
+    [0-9]) disk=`/usr/bin/awk '/ '"$1"'\./ {print $2}' /tmp/dsk.log`
+    ;;
+    c[0-9]*t[0-9]*d[0-9]*s[0-8])
+      # check if the user provided a valid zpool
+      print "\tChecking zpool on: $1 ..."
+      for pool in `zpool list | sed -e "/^NAME/d" | awk '{print $1}'`
+      do
+        ISIN=`/usr/sbin/zpool status $pool | grep -c ${1}`
+        if [ "$ISIN" -eq 1 ]; then
+          pool_name=$pool
+          break
+        fi
+      done
+      if [ "$ISIN" -eq 1 -a -n "$pool_name" ]; then
+        instslice=$1
+        defpart=no
+        disk=`echo $1 | sed -e "s@s.*@@g"`
+      else
+        printf "\n\t\t\tdisk-slice: $1 has not a valid ZPOOL - exit." ; sleep 5; exit 0
+      fi
+    ;;
+    *) print "\n\tonly two disks allowed for mirroring... - exit." ; sleep 5 ; exit 0
+    ;;
+  esac
+  if [ "$ARCH" = "sparc" ]; then
+    for echk in $disk $mirror
+    do
+      prtvtoc /dev/rdsk/${echk}s2 >/dev/null2>/dev/null
+      if [ $? -ge 1 ]; then
+        print "\tdisk: $echk uses EFI disklabel - not supported on SPARC."
+        printf "\tDo you want to convert the EFI label into SMI label for: $echk (default=Y/n?): "
+        read label
+        case $label in
+          n|No|N) echo "\n\tPlease choose another disk for installation\n"; sleep 5; exit 0
+          ;;
+          *) printf "\tConverting..."
+             smilabel $echk
+             smiconv=true
+             echo " done"
+          ;;
+        esac
+      fi
+    done
+    if [ "$smiconv" = "true" ]; then
+      print "\n\tYou just have converted EFI into SMI labels,"
+      printf "\tplease use the format program in a SHELL to partition your disk(s)"
+      sleep 10; exit 0
+    fi
+  else
+    # check if this is really an EFI boot.
+    EFI=`/usr/sbin/prtconf -v 2>/dev/null | /usr/bin/grep -c efi-systab`
+    # first let's handle the easiest case - new disk with no physical partitions at all.
+    CHKPART=`/sbin/fdisk -W -v /dev/rdsk/${disk}p0 | /usr/bin/grep -c "^  0"`
+    if [ "$CHKPART" -eq "4" ]; then
+      printf "\n\tCreating illumos fdisk Partition..."
+      /sbin/fdisk -B /dev/rdsk/${disk}p0
+      echo " done."
+    fi
+    # lookup existing illumos fdisk partition, check active flag.
+    ILUP=`/sbin/fdisk -W -v /dev/rdsk/${disk}p0 | /usr/bin/awk '/^  191/ {print $2}'`
+    if [ "$ILUP" -eq "128" ]; then
+      printf "\n\tUsing existing active primary illumos fdisk Partition:"
+      /sbin/fdisk -W -v /dev/rdsk/${disk}p0 | /usr/bin/grep "^  " >/tmp/fdiskchk.$$
+      printf " ${disk}p"
+      /usr/bin/awk '/^  191/ && $2==128  {print NR}' /tmp/fdiskchk.$$
+      rm /tmp/fdiskchk.$$
+    fi
+  fi
+  disk_okay=okay
+}
+
+# Function to validate hostname
+validate_hostname() {
+  HOSTNAME="$1"
+
+  # Length check
+  if [ ${#HOSTNAME} -lt 1 ] || [ ${#HOSTNAME} -gt 253 ]; then
+    echo "Invalid: Hostname must be between 1 and 253 characters."
+    return 1
+  fi
+
+  # Allowed characters check
+  echo "$HOSTNAME" | /usr/bin/grep -qE '^[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]$|^[a-zA-Z0-9]$'
+  if [ $? -ne 0 ]; then
+    echo "Invalid: Hostname must contain only letters, numbers,"
+    echo "or hyphens, and cannot start or end with a hyphen."
+    return 1
+  fi
+  return 0
+}
+
+validate_netmask()
+{
+  SUBMASK="$1"
+  if [ `echo ${SUBMASK} | egrep "[0-9,a-f]{8}"` >/dev/null 2>&1 ]; then
+    # we got a hex mask like ffffff00
+    for i in 0 2 4 6; do
+      ones=$(printf "obytes=2;%d\n" "0x${SUBMASK:${i}:2}" | bc | tr -d 0)
+      mask=$(( ${mask} + ${#ones} )) # add the amount of remaining ones to bits
+    done
+  fi
+  if [ `echo ${SUBMASK} | egrep "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+"` >/dev/null 2>&1 ]; then
+    # we have a decimal netmask
+    echo ${SUBMASK} | tr '.' ' ' | read decnm[1] decnm[2] decnm[3] decnm[4]
+    for i in 1 2 3 4; do
+      if [ ${decnm[${i}]} -gt 255 ]; then
+        echo "Invalid decimal netmask, must be x.x.x.x with x >0 and <=255"
+        sleep 5
+      fi
+      ones=$( echo "obytes=2;${decnm[${i}]}" | bc | tr -d 0) # convert decimal to binary and delete zeros
+      mask=$(( ${mask} + ${#ones} )) # add the amount of remaining ones to bits
+    done
+  fi
+  if [ ${mask} -eq 0 ]; then
+    if [ ${SUBMASK##/} -le 32 -a ${SUBMASK##/} -gt 0 ]; then
+      # we got a CIDR prefix, either /xx or xx
+      mask=${SUBMASK##/}
+    else
+      echo "Invalid CIDR, must be >1 and <=32"
+      sleep 5
+    fi
+  fi
+}
+
+# Function to validate zpool for installation
+validate_zpool()
+{
+  sed -e "/^ config:/,+1d" /tmp/ztemp.log >/tmp/zpool.log
+  for id in `awk '/id:/ {print $2}' /tmp/zpool.log`
+  do
+    P2L=`grep -B 1 $id /tmp/zpool.log | awk '/pool:/ {print $2}'`
+    grep -B 1 $id /tmp/zpool.log | head -1 >/tmp/${P2L}_${id}_zpool.log
+    nawk '/'"$id"'/,/^$/ {print $0}' /tmp/zpool.log >>/tmp/${P2L}_${id}_zpool.log
+    ISIN=`grep -c ${1}s /tmp/${P2L}_${id}_zpool.log`
+    if [ "$ISIN" -eq 1 ]; then
+      F2S=/tmp/${P2L}_${id}_zpool.log
+      break
+    fi
+  done
+  if [ -n "$P2L" ]; then
+    if [ "$2" = mirror ]; then
+      print "\n\tYour disk mirror choice: $1 is used by zpool:"
+    else
+      print "\n\tYour disk choice: $1 is used by zpool:"
+    fi
+    echo
+    /usr/bin/cat $F2S
+    NLINE=`awk '{line = $NR} END {print line}' $F2S`
+    if [ -z "$NLINE" ]; then
+      echo
+    fi
+    #OMIR=`grep -c mirror-0 $F2S`
+    #if [ $OMIR -ge 1 ]; then
+    #  printf "\n\tdo you want to evacuate: "
+    #  SDSK=`grep "^	    c" $F2S | sed -e "/${1}/d" | awk '{print $1}'`
+    #  printf "$SDSK"
+    #  print " from this mirror,"
+    #  printf "\tto save it's data/os for later use (default=Y/n?): "
+    #else
+      print "\tif you continue, all data on it will be destroyed !!!"
+      printf "\tplease confirm (default=Y/n?): "
+    #fi
+    read go
+    case $go in
+      n|N| no|No)
+        if [ -n "$SDSK" ]; then
+          pool_name=$P2L
+          defpart=yes
+        else
+          exit 0
+        fi
+      ;;
+      *)
+        #if [ -n "$SDSK" ]; then
+        #  printf "\n\tsplitting: $SDSK from zpool: ${P2L}"
+	#  ZID=`grep "^     id:" ${F2S} | awk '{print $2}'`
+        #  printf "."
+        #  zpool import -o altroot=/a $ZID
+        #  printf "."
+        #  zpool detach $P2L $SDSK
+        #  zpool export $P2L
+        #  sleep 2
+        #  printf "."
+        #  rm -rf /a
+        #  pool_name=$P2L
+        #  defpart=yes
+        #  echo " done."
+        #else
+          pool_name=rpool
+          defpart=yes
+        #fi
+      ;;
+    esac
+  else
+    pool_name=rpool
+  fi
+  rm -f /tmp/*_zpool.log*
+}
+
+# set the distribution
+distribution=`/usr/bin/awk '/powered by illumos/ {print $1}' /etc/release`
+# set inital netmask variables.
+mask=0
+ones=0
+
+# disk selection - start
+CLEANSSCREEN=0
+disk_okay=no
+while [ $disk_okay != "okay" ]
+do
+  if [ ! -f /tmp/devfsadm.run ]; then
+    printf "\n\tBuilding initial device tree - please wait..."
+    /usr/sbin/devfsadm 2>/dev/null >/dev/null
+    touch /tmp/devfsadm.run
+    echo " done."
+  fi
+  clear
+  echo
+  print "\t\tWelcome to the new $distribution text-installer\n"
+  print "Thanks for choosing to install ${distribution}! This installer enables you to"
+  print "install the $distribution Operating System (OS) on x86 or SPARC systems.\n"
+  print "The installation takes place using ZFS filesystems on slice 0 of the disk you"
+  print "will be choosing below. If this is not what you want, please use <q> down below"
+  print "and <3> in the top-level menu to exit to a SHELL. Use the <format> and <zpool>"
+  print "commands to prepare the disk-slice you want to install on. Specify the complete"
+  print "slice instead of a numeric disk choice."
+  print "NOTE: From time to time it can happen, that you see a dump of the device tree,"
+  print "in this case, just press ^C to to restart all over from the top menu.\n"
+  printf "\tSeeking disks on system..."
+format >/tmp/dsk.log <<EOF 2>/dev/null
+EOF
+  if [ `/usr/bin/grep -c "^AVAIL" /tmp/dsk.log` -eq 1 ]; then
+    print " done\n"
+    /usr/bin/awk '/ [0-9]*\./' /tmp/dsk.log
+    print "\nInstall to existing ZPOOL - specify complete slice e.g. c0t0d0s0"
+    #print "If you plan a mirrored OS configuration, please separate disks e.g.: 0,1"
+    #printf "\n\tChoose disk(s)/slice to install, or q to quit: "
+    printf "\n\tChoose disk or slice to install, or q to quit: "
+    read num
+    case $num in
+      [0-9]*) validate_disk $num
+      ;;
+      [0-9]*,[0-9]*) validate_disk $num
+      ;;
+      c[0-9]*t[0-9]*d[0-9]*s[0-8]) validate_disk $num
+      ;;
+       q) echo "\nBye, bye...\n"; sleep 5; exit 0
+      ;;
+      *) echo "\n\tNo such disk/slice: $num - next try"; sleep 5
+    esac
+    numlen=`expr "$num" : '.* *'`
+  else
+    print " No disks found!"
+    printf "\n\tPlease check disk configuration - and come back..."
+    sleep 5
+    exit 0
+  fi
+done
+rm /tmp/dsk.log
+dlenght=`expr "$disk" : '.* *'`
+# disk selection - end
+
+# rpool name
+if [ -z "$pool_name" ]; then
+  printf "\n\tChecking for system zpools..."
+  /usr/sbin/zpool import >/tmp/ztemp.log 2>/dev/null
+  if [ ! -s /tmp/ztemp.log ]; then
+    print "\tNone found, using pool name: rpool for install."
+    pool_name=rpool
+    defpart=yes
+  else
+    if [ "$numlen" -eq 1 ]; then
+      validate_zpool $disk
+    else
+      validate_zpool $disk
+      #validate_zpool $mirror mirror
+    fi
+  fi
+fi
+rm -f /tmp/zpool.log /tmp/ztemp.log
+plenght=`expr "$pool_name" : '.* *'`
+[ -z "$instslice" ] && instslice="${disk}s0"
+if [ -n "$mirror" ]; then
+  mirrslice=`echo $instslice | sed -e "s@$disk@$mirror@g"`
+  mlenght=`expr "$mirrslice" : '.* *'`
+fi
+slenght=`expr "$instslice" : '.* *'`
+
+# checking for DHCP, created by svc:/network/physical:nwam
+if [ -f /etc/resolv.conf ]; then
+  # try to find out which nic was used for DHCP.
+  nic=`/sbin/ipadm show-addr | /usr/bin/awk -F/ '/dhcp/ && /ok/ {print $1}'`
+  if [ -n "$nic" ]; then
+    numnic=`echo $nic | wc -w | awk '{print $1}'`
+    if [ "$numnic" -eq "1" ]; then
+      DHCP=true
+      TST=`/sbin/dhcpinfo Hostname`
+      [ -n "$TST" ] && HOSTNAME=$TST ; unset TST
+      TST=`/sbin/dhcpinfo Router`
+      [ -n "$TST" ] && ROUTER=$TST ; unset TST
+      TST=`/sbin/dhcpinfo Yiaddr`
+      [ -n "$TST" ] && IP=$TST ; unset TST
+      TST=`/sbin/dhcpinfo Subnet`
+      [ -n "$TST" ] && SUBMASK=$TST ; unset TST
+      TST=`/sbin/dhcpinfo DNSdmain`
+      [ -n "$TST" ] && DNSDOMAIN=$TST ; unset TST
+      TST=`/sbin/dhcpinfo DNSserv`
+      [ -n "$TST" ] && DNSSRV=$TST ; unset TST
+      TST=`/sbin/dhcpinfo ServerID`
+      [ -n "$TST" ] && SERVER=$TST ; unset TST
+      [ -n "$SUBMASK" ] && validate_netmask $SUBMASK
+      # get IPv6 address probably for static use later.
+      IPv6ip=`ipadm show-addr | \
+            /usr/bin/nawk '/'"$nic"'/ && $2 ~ /addrconf/ {sub("%.*",""); print $4}'`
+    else
+      print "\tIt seems there is more than one network interface under DHCP control,"
+      printf "\tplease use just one DHCP network interface for installation! exit. "
+      /bin/sleep 20; exit 0
+    fi
+  fi
+else
+  DHCP=false
+  nic=none
+fi
+
+if [ "$nic" != none ]; then
+  if [ -z "$HOSTNAME" ]; then
+    while true
+    do
+      printf "\tHostname: "
+      read HOSTNAME
+      if validate_hostname "$HOSTNAME"; then
+        /usr/bin/hostname "$HOSTNAME"
+        break
+      else
+        echo "Hostname not set due to validation failure."
+      fi
+    done
+  fi
+  print "\n\tThe following network configuration has been detected on: ${nic}\n"
+  print "\t  Hostname: $HOSTNAME"
+  print "\tIP-Address: $IP"
+  print "\tSubnetmask: ${SUBMASK}"
+  /usr/bin/awk '{print "\t" $0}' /etc/resolv.conf
+  print "\n\tSystem: $HOSTNAME will be configured using Dynamic Host"
+  print "\tConfiguration Protocol, if you accept the default."
+  printf "\tDo you want to use DHCP for network configuration (default=Y/n?): "
+  read yesno
+  case $yesno in
+    n|no|No) print "\tDo you want to use above information to setup: $nic with"
+       printf "\tstatic IP configuration, to omit DHCP control on it (default=Y/n?): "
+       read conv
+       case $conv in
+         n|no|No) net=none nic=none ntype=static DHCP=false
+         ;;
+         *) net=okay ntype=static nic=$nic DHCP=false
+         ;;
+       esac
+    ;;
+    *) net=okay ntype=dynamic
+    ;;
+  esac
+fi
+
+if [ "$nic" = none ]; then
+  net=none
+  # cleanup from a previous run.
+  [ -f /etc/resolv.conf ] && rm -f /etc/resolv.conf
+  echo "\n\tWhich network interface do want to use ?\n"
+  while [ $net != "okay" ]
+  do
+    tnics=`/sbin/dladm show-phys | /usr/bin/awk '/Ethernet/ {printf $1 "|"}'`
+    /sbin/dladm show-phys | /usr/bin/awk '/Ethernet/ {print "\t\t\t\t\t    " $1}'
+    printf "\n\t\t\t       Your choice: "
+    read nic
+    case $nic in
+      $tnics) net=okay
+      ;;
+      *) echo "\n\t\t\tInvalid network-interface - please try again!\n"
+      ;;
+    esac
+  done
+  DHCP=false
+  printf "\t\t\t\t  Hostname: "
+  read HOSTNAME
+  if validate_hostname "$HOSTNAME"; then
+    /usr/bin/hostname "$HOSTNAME"
+  else
+    echo "Hostname not set due to validation failure."
+  fi
+  printf "\t\t\t\tIP-Address: "
+  read IP
+  while true
+  do
+    printf "\tEnter netmask decimal, hex or CIDR: "
+    read SUBMASK
+    validate_netmask $SUBMASK
+    if [ $mask -ne 0 ]; then
+      break
+    fi
+  done
+  printf "\t\t\t\t    Router: "
+  read ROUTER
+  printf "\t\t\t\tDNS Domain: "
+  read DNSDOMAIN
+  if [ `echo "$DNSDOMAIN" | grep -c "\."` -ge "1" ]; then
+    echo "domain  ${DNSDOMAIN}" >/etc/resolv.conf
+    echo "search $DNSDOMAIN" >>/etc/resolv.conf
+  else
+    unset DNSDOMAIN
+  fi
+  printf "DNS server IPs max. 3, seperated by spaces: "
+  read DNSSRV
+  if [ `echo "$DNSSRV" | grep -c "\."` -ge "1" ]; then
+    for srv in $DNSSRV
+    do
+      echo "nameserver  $srv" >> /etc/resolv.conf
+    done
+  else
+    unset DNSSRV
+  fi
+  if [ -z "$DNSDOMAIN" ] && [ -z "$DNSSRV" ]; then
+    print "\n\t\tDisable Domain Name Services no information given !\n"
+  fi
+  ntype=static
+  DHCP=false
+  echo
+fi
+
+# set lenght of network interface variable.
+nlenght=`expr "$nic" : '.* *'`
+
+while true
+do
+  printf "\tDo you want to convert the root account to be a role (default=N/y?): "
+  read rbac
+  case $rbac in
+    y|Y|Yes) DO_RBAC=yes; break
+    ;;
+    *) DO_RBAC=no; break
+    ;;
+  esac
+done
+
+# and now the NFSv4 stuff
+nfs4=none
+printf "\tNFSv4 Domain Name  <RETURN> for none: "
+while [ $nfs4 != "okay" ]
+do
+  read nfs4dom
+  case $nfs4dom in
+    [a-z,A-Z,0-9,.]*) nfs4=okay
+    ;;
+    *) break; nfs4=none
+    ;;
+  esac
+done
+
+# timezone/date handling.
+print "\n\tSelect the region that contains your time zone.\n"
+print "\tRegions"
+print "\t______________________________________________\n"
+while true
+do
+  echo "UTC/GMT" >/tmp/myregion
+  cut -d'	' -f2- /usr/share/lib/zoneinfo/tab/continent.tab | \
+  	/usr/bin/sed "/^#/d" >> /tmp/myregion
+  /usr/bin/awk '{printf("\t%2d. ", NR); print $0}' /tmp/myregion
+  rm /tmp/myregion
+  printf "\n\tplease select: "
+  read region
+  case $region in
+    1) ZDIR=GMT; break ;;
+    2) ZDIR=Africa; break ;;
+    3) ZDIR=America; break ;;
+    4) ZDIR=Antarctica; break ;;
+    5) ZDIR=Arctic; break ;;
+    6) ZDIR=Asia; break ;;
+    7) ZDIR=Atlantic; break ;;
+    8) ZDIR=Australia; break ;;
+    9) ZDIR=Europe; break ;;
+    10) ZDIR=Indian; break ;;
+    11) ZDIR=Pacific; break ;;
+    *) echo "\n\t\tInvalid Region: $region - please try again!\n" ;;
+  esac
+done
+
+if [ "$ZDIR" != "GMT" ]; then
+  print "\n\tSelect the location that contains your time zone.\n"
+  print "\tLocations"
+  print "\t______________________________________________\n"
+  CHECK=0
+  while [ $CHECK -ne 1 ]; do
+    select_timezone $ZDIR
+  done
+fi
+
+if [ "$ZDIR" = "GMT" ]; then
+  TZ=GMT
+else
+  TZ="${ZDIR}/${COUNTRY}"
+fi
+export TZ
+
+date '+%m/%d/%y %c%H:%M:%S'
+printf "\n\t\tcorrect (default=Y/n?):"
+read dtime
+case $dtime in
+  n|N|No) printf "\tSpecify new date/time - format: Month/Day/Hour/Minute: "
+    while true
+    do
+      read ntime
+      if [ `expr "$ntime" : '.* *'` -ne "8" ]; then
+        printf "\n\twrong format single digits have to prefixed with '0' - try again!\n"
+        printf "\n\tDate/Time: "
+      else
+        date $ntime >/dev/null
+        break
+      fi
+    done
+  ;;
+  *)
+  ;;
+esac
+
+# set keyborad layout.
+LAYOUT=US-English
+TYPE=`/usr/bin/kbd -l | /usr/bin/awk -F'[= ]' '{if ($1 == "layout") print $2}'`
+if [ -n $TYPE ]; then
+  LAYOUT=`/usr/bin/awk -v ntyp=$TYPE -F= '{if ($2 == ntyp) print $1}' /usr/share/lib/keytables/type_6/kbd_layouts`
+fi
+
+# try to find default router.
+if [ -z $ROUTER ]; then
+  ROUTER=`netstat -rn | /usr/bin/awk '/default/ {print $2}' | sort -u`
+fi
+
+# to be able to use the passwd command we first have to remove /etc/passwd
+# and /etc/group then copy them over from /mnt/misc/etc
+rm /etc/passwd /etc/group
+cp -p /mnt/misc/etc/passwd /etc/passwd
+cp -p /mnt/misc/etc/group /etc/group
+# get the old timestamp of /etc/shadow to at least ensure that passwd has been used,
+# however since root is using passwd command we can't realy tell if a passwd has been
+# set, because passwd also accepts just return :-( for sure this needs improvement.
+STAMP=`/usr/bin/awk -F: '/^root/ {print $3}' /mnt/misc/etc/shadow`
+print "\n\tDefine a root password for the system and user account for yourself.\n"
+print "\tSystem Root Password:\n"
+while true
+do
+  /usr/bin/passwd
+  SETPW=`/usr/bin/awk -F: '/^root/ {print $3}' /etc/shadow`
+  if [ $SETPW -gt $STAMP ]; then
+    RLINE=`/usr/bin/awk '/^root/' /etc/shadow`
+    break
+  fi
+done
+
+# 1000 is the default for UID/GID since ages.
+uid=1000
+gid=1000
+print "\n\tCreate a user account."
+printf "\tYour real name:\t"
+read rname
+while true
+do
+  printf "\t      Username:\t"
+  read lname
+  ulenght=`expr "$lname" : '.* *'`
+  printf "    UID (default=${uid}): "
+  read uid
+  case $uid in
+    [0-9]*) if [ `expr "$uid" : '.* *'` -lt "5" ]; then
+              print "\n\twrong UID range given - must be at least 5 digits.\n"
+            else
+              break
+            fi
+    ;;
+    [a-z,A-Z]*) print "\n\twrong UID format given - can only contian digits.\n"
+    ;;
+    *) uid=1000
+       break
+    ;;
+  esac
+done
+
+while true
+do
+  printf "    GID (default=${gid}): "
+  read gid
+  case $gid in
+    [0-9]*) if [ `expr "$gid" : '.* *'` -lt "4" ]; then
+              print "\n\twrong GID range given - must be at least 4 digits.\n"
+            else
+              break
+            fi
+    ;;
+    [a-z,A-Z]*) print "\n\twrong UID format given - can only contian digits.\n"
+    ;;
+    *) gid=1000
+       break
+    ;;
+  esac
+done
+echo "users::${gid}:" >> /etc/group
+
+printf "\n${lname}'s "
+echo "${lname}:x:${uid}:${gid}:${rname}:/tmp/${lname}:/usr/bin/bash" >>/etc/passwd
+echo "${lname}::6445::::::" >>/etc/shadow
+/usr/bin/passwd $lname
+UHASH=`/usr/bin/awk -F: '/'"$lname"'/ {print $2}' /etc/shadow`
+
+# check if we have at least one nic up and running.
+if [ `/sbin/dladm show-phys | grep -c up` -ge "1" ]; then
+  while true
+  do
+    print "\n\tChoose your final installation type:\n"
+    print "\t1. Server		2. SunRay - includes Mate Desktop"
+    print "\t3. Developer		4. Mate Desktop System"
+    print "\t5. Devolper + Mate 	6. SunRay + Developer"
+    print "\t7. Server + Developer + Mate Desktop System"
+    print "\t8. All Combinations\n"
+    print "\tq. don't install additional software right now\n"
+    printf "\tPlease make your choice (1,2,3,4,5,6,7,8 or q): "
+    read choice
+    case $choice in
+      1) addsw=server_install
+         dev=no
+         UPD="Server System"
+         break
+      ;;
+      2) addsw="mate_install consolidation/sunray/sunray-essential"
+         dev=no
+         UPD="SunRay Server"
+         break
+      ;;
+      3) addsw="metapackages/build-essential"
+         dev=yes
+         UPD="Developer System"
+         break
+      ;;
+      4) addsw=mate_install
+         dev=no
+         UPD="Mate Desktop System"
+         break
+      ;;
+      5) addsw="metapackages/build-essential mate_install"
+         dev=yes
+         UPD="Mate Desktop System and Developer Support"
+         break
+      ;;
+      6) addsw="consolidation/sunray/sunray-essential mate_install metapackages/build-essential"
+         dev=yes
+         UPD="SunRay Server + Developer System"
+         break
+      ;;
+      7) addsw="server_install metapackages/build-essential mate_install"
+         dev=yes
+         UPD="Server, Developer and Mate Desktop System"
+         break
+      ;;
+      8) addsw="server_install consolidation/sunray/sunray-essential metapackages/build-essential mate_install"
+         dev=yes
+         UPD="Server, SunRay Server, Developer and Mate Desktop System"
+         break
+      ;;
+      q) break
+      ;;
+      *) echo "\n\t\twrong input - try again.\n"
+      ;;
+    esac
+  done
+fi
+
+print "\n\tPlease review the settings below before installing. If not okay, just"
+print "\tpress ^C to start all over from the previous menu, using option <1>\n"
+print "           Hostname: $HOSTNAME"
+print "      RBAC for root: $DO_RBAC"
+print "  Network Interface: $nic configuration type: $ntype"
+[ -n $ROUTER ] && print "     Default Router: $ROUTER"
+print "   User Account for: $rname"
+print "         Login Name: $lname - UID=$uid GID=${gid}(users)"
+print "           Keyboard: $LAYOUT"
+printf "  Current Date/Tine: "
+date
+print "           TIMEZONE: $TZ"
+if [ -n "$nfs4dom" ]; then
+  print "  NFSv4 Domain Name: $nfs4dom"
+fi
+if [ -f /etc/resolv.conf ]; then
+  printf "\t DNS Domain: "
+  /usr/bin/awk '/domain/ {print $2}' /etc/resolv.conf
+  printf "      DNS server(s): "
+  for srv in `/usr/bin/awk '/nameserver/ {print $2}' /etc/resolv.conf`
+  do
+    printf "$srv "
+  done
+  echo
+fi
+if [ -n "$mirror" ]; then
+  print " Disk configuration: mirrored disks on: ${disk} & ${mirror}"
+else
+  print " Disk configuration: single disk on: ${disk}"
+fi
+
+if [ -n "$addsw" ]; then
+  print "  Installation Type: $UPD"
+fi 
+
+printf "\n\tSettings okay? just hit <RETURN> to start the installation: "
+read go
+
+# get size of slice 2 and relabel slice 0 if default partitioning has been used.
+if [ $defpart = yes ]; then
+  # now constuct a label script
+  if [ -n "$mirror" ]; then
+    len=`expr $mlenght + $dlenght`
+    printf "\nLabeling disks: ${disk}/${mirror}"
+    dneed=`expr 52 - $len`
+  else
+    printf "\nLabeling disk: ${disk}"
+    dneed=`expr 52 - $dlenght`
+  fi
+  BLKS=`prtvtoc /dev/rdsk/$instslice | /usr/bin/awk '$1 ~ /2/ {print $5}'`
+  if [ "$ARCH" = "i386" ]; then
+    BBCK=`prtvtoc /dev/rdsk/$instslice | /usr/bin/awk '$1 ~ /8/ {print $5}'`
+    BLKS=`expr $BLKS - $BBCK`
+  fi
+  echo "p\n0\nroot\nwm" > /tmp/label_script
+  if [ "$ARCH" = "i386" ]; then
+    echo "1" >>/tmp/label_script
+  else
+    echo "0" >>/tmp/label_script
+  fi
+  echo "${BLKS}b" >>/tmp/label_script
+  echo "1\nunassigned\nwm\n0\n0" >>/tmp/label_script
+  echo "3\nunassigned\nwm\n0\n0" >>/tmp/label_script
+  echo "4\nunassigned\nwm\n0\n0" >>/tmp/label_script
+  echo "5\nunassigned\nwm\n0\n0" >>/tmp/label_script
+  echo "6\nunassigned\nwm\n0\n0" >>/tmp/label_script
+  echo "7\nunassigned\nwm\n0\n0" >>/tmp/label_script
+  echo "q\nl" >>/tmp/label_script
+  format -s -d ${disk} -f /tmp/label_script
+  rm /tmp/label_script
+  if [ -n "$mirror" ]; then
+    /usr/sbin/prtvtoc -h /dev/rdsk/${disk}s2 | fmthard -s - /dev/rdsk/${mirror}s2 1>/dev/null
+  fi
+  while [ "$dneed" -ne "0" ]; do printf "."; dneed=`expr ${dneed} - 1`; done
+  echo " done."
+else
+  echo
+fi
+
+ALTROOT=/a
+/usr/bin/mkdir -p ${ALTROOT}
+len=`expr $plenght + $slenght`
+if [ "$defpart" = yes ]; then
+  if [ -n "$mirror" ]; then
+    len=`expr $len + $mlenght`
+    printf "Creating: ${pool_name} on: ${instslice}/${mirrslice}"
+    /usr/sbin/zpool labelclear -f ${instslice} 2>/dev/null
+    /usr/sbin/zpool labelclear -f ${mirrslice} 2>/dev/null
+    /usr/sbin/zpool create -f -o failmode=continue ${pool_name} mirror ${instslice} ${mirrslice}
+    dneed=`expr 51 - ${len}`
+  else
+    dneed=`expr 47 - ${len}`
+    printf "Creating: ${pool_name} on disk: ${instslice}"
+    /usr/sbin/zpool labelclear -f ${instslice} 2>/dev/null
+    /usr/sbin/zpool create -f -o failmode=continue ${pool_name} ${instslice}
+  fi
+  while [ "$dneed" -ne "0" ]; do printf "."; dneed=`expr ${dneed} - 1`; done
+  print " done."
+fi
+
+printf "Creating needed ZFS filesystems on zpool: ${pool_name}"
+/usr/sbin/zfs create -o mountpoint=legacy ${pool_name}/ROOT
+/usr/sbin/zfs create -o mountpoint=${ALTROOT} ${pool_name}/ROOT/openindiana
+printf "."
+/usr/sbin/zfs create -o mountpoint=${ALTROOT}/var ${pool_name}/ROOT/openindiana/var
+/usr/sbin/zfs create -o mountpoint=${ALTROOT}/export ${pool_name}/export
+printf "."
+/usr/sbin/zfs create -o mountpoint=${ALTROOT}/export/home ${pool_name}/export/home
+# calculate size of dump/swap volumes.
+MEM=`/usr/sbin/prtconf | awk '/^Memory/ {print $3}'`
+if [ "$MEM" -lt "2050" ]; then
+  VSZ=2048
+elif [ "$MEM" -lt "4100" ]; then
+  VSZ=4096
+elif [ "$MEM" -lt "8200" ]; then
+  VSZ=8192
+else
+  VSZ=16384
+fi
+printf "."
+/usr/sbin/zfs create -V ${VSZ}m ${pool_name}/dump
+printf "."
+/usr/sbin/zfs create -V ${VSZ}m -b 8k ${pool_name}/swap
+printf "."
+/usr/sbin/zfs set org.opensolaris.libbe:uuid=`/usr/bin/uuidgen` ${pool_name}/ROOT/openindiana
+printf "."
+/usr/sbin/zpool set bootfs="${pool_name}/ROOT/openindiana" ${pool_name}
+dneed=`expr 19 - ${plenght}`
+while [ "$dneed" -ne "0" ]; do printf "."; dneed=`expr ${dneed} - 1`; done
+echo " done."
+
+# transfer the OS now.
+printf "Populating the /etc directory.................."
+START=`truss -t time date 2>&1 1>/dev/null | /usr/bin/sed -n "1s/.*= //p"`
+cd /mnt/misc
+/usr/bin/find etc -depth -print | cpio -pdmu ${ALTROOT} 2>/dev/null
+rm /etc/svc/repository.db
+cp /lib/svc/seed/global.db ${ALTROOT}/etc/svc/repository.db
+(cd /etc/svc; ln -s ${ALTROOT}/etc/svc/repository.db repository.db)
+echo $HOSTNAME > ${ALTROOT}/etc/nodename
+
+# set TIMEZONE.
+/usr/bin/sed -i s:PST8PDT:$TZ: ${ALTROOT}/etc/default/init
+
+# fix /etc/system
+/usr/bin/sed -e "/^set zfs/d" ${ALTROOT}/etc/system >/tmp/fix_etc_system
+/usr/bin/mv /tmp/fix_etc_system ${ALTROOT}/etc/system
+/usr/bin/chgrp sys ${ALTROOT}/etc/system
+
+# add swap space
+echo "/dev/zvol/dsk/${pool_name}/swap\t-\t-\tswap\t-\tno\t-" >>${ALTROOT}/etc/vfstab
+
+END=`truss -t time date 2>&1 1>/dev/null | /usr/bin/sed -n "1s/.*= //p"`
+SEC=`expr $END - $START`
+while [ `expr "$SEC" : '.* *'` -ne "3" ]
+do
+  SEC=" "$SEC
+done
+print " done: ${SEC} seconds needed."
+
+printf "Populating the root filesystem.........."
+START=`truss -t time date 2>&1 1>/dev/null | /usr/bin/sed -n "1s/.*= //p"`
+cd /
+for i in boot kernel lib platform root sbin usr
+do
+  /usr/bin/find $i -print -depth | cpio -pdm ${ALTROOT} 2>/dev/null
+  printf "."
+done
+END=`truss -t time date 2>&1 1>/dev/null | /usr/bin/sed -n "1s/.*= //p"`
+SEC=`expr $END - $START`
+while [ `expr "$SEC" : '.* *'` -ne "3" ]
+do
+  SEC=" "$SEC
+done
+print " done: ${SEC} seconds needed."
+
+printf "Populating the /var filesystem................."
+START=`truss -t time date 2>&1 1>/dev/null | /usr/bin/sed -n "1s/.*= //p"`
+cd /mnt/misc/var
+/usr/bin/find . -depth -print | cpio -pdm ${ALTROOT}/var 2>/dev/null
+# needed if run a second time, for debugging.
+[ -f /var/pkg/lock ] && /bin/rm /var/pkg/lock
+[ -f /var/pkg/modified ] && /bin/rm /var/pkg/modified
+END=`truss -t time date 2>&1 1>/dev/null | /usr/bin/sed -n "1s/.*= //p"`
+SEC=`expr $END - $START`
+while [ `expr "$SEC" : '.* *'` -ne "3" ]
+do
+  SEC=" "$SEC
+done
+print " done: ${SEC} seconds needed."
+
+if [ -f /.usr.tar.xz ]; then
+  printf "Populating the /usr directory..................."
+  START=`truss -t time date 2>&1 1>/dev/null | /usr/bin/sed -n "1s/.*= //p"`
+  cd /
+  xzcat .usr.tar.xz | ( cd ${ALTROOT}/usr; tar xpf - )
+  END=`truss -t time date 2>&1 1>/dev/null | /usr/bin/sed -n "1s/.*= //p"`
+  SEC=`expr $END - $START`
+  while [ `expr "$SEC" : '.* *'` -ne "3" ]
+  do
+    SEC=" "$SEC
+  done
+  echo "done: ${SEC} seconds needed."
+fi
+
+printf "Adding extra directories."
+cd ${ALTROOT}
+/usr/bin/ln -s ./usr/bin .
+printf "."
+/usr/bin/mkdir -m 1777 tmp
+printf "."
+/usr/bin/mkdir -p system/contract system/object system/boot proc mnt dev devices/pseudo
+printf "."
+/usr/bin/mkdir -p dev/fd dev/rmt dev/swap dev/dsk dev/rdsk dev/net dev/ipnet
+printf "."
+/usr/bin/mkdir -p dev/sad dev/pts dev/term dev/vt dev/zcons
+printf "."
+/usr/bin/chgrp -R sys dev devices mnt
+printf "."
+/usr/bin/chmod 0555 system system/* proc
+printf "."
+cd dev
+/usr/bin/ln -s ./fd/2 stderr
+/usr/bin/ln -s ./fd/1 stdout
+printf "."
+/usr/bin/ln -s ./fd/0 stdin
+printf "."
+/usr/bin/ln -s ../devices/pseudo/dld@0:ctl dld
+printf "."
+cd /
+printf "............"
+echo " done"
+
+if [ ! -f ${ALTROOT}/etc/svc/profile/sc_profile.xml ]; then
+  printf "Setting default keyboard-layout..............."
+  cp ${ALTROOT}/usr/share/install/sc_template.xml ${ALTROOT}/etc/svc/profile/sc_profile.xml
+  printf "."
+  /usr/bin/sed -i s:US-English:${LAYOUT}: ${ALTROOT}/etc/svc/profile/sc_profile.xml
+  echo " done"
+fi
+
+SVCCFG_REPOSITORY=${ALTROOT}/etc/svc/repository.db
+export SVCCFG_REPOSITORY
+if [ $DHCP = true ]; then
+  printf "Configure $nic for DHCP use"
+  dneed=`expr 22 - $nlenght`
+  if [ -n "$ROUTER" ]; then
+    echo "setup_route default $ROUTER" >${ALTROOT}/etc/sysding.conf
+  fi
+  printf "."
+  /usr/sbin/svccfg -s network/physical:default setprop general/enabled=false
+  printf "."
+  /usr/sbin/svccfg -s network/physical:nwam setprop general/enabled=true
+  while [ "$dneed" -ne "0" ]; do printf "."; dneed=`expr ${dneed} - 1`; done
+else
+  printf "Configure network: $nic"
+  dneed=`expr 25 - $nlenght`
+  echo '#!/usr/bin/ksh\n' >${ALTROOT}/etc/sysding.conf
+  echo "setup_interface $nic v4 ${IP}/${mask}" >>${ALTROOT}/etc/sysding.conf
+  /usr/sbin/svccfg -s network/physical:default setprop general/enabled=true
+  printf "."
+  if [ -z "$IPv6ip" ]; then
+    ipadm create-addr -T addrconf ${nic}/v6link
+    IPv6ip=`ipadm show-addr | grep "${nic}/v6link" | nawk '{gsub("%.*",""); print $4}'`
+  fi
+  echo "setup_interface $nic v6 ${IPv6ip}/10" >>${ALTROOT}/etc/sysding.conf
+  /usr/sbin/svccfg -s network/physical:nwam setprop general/enabled=false
+  printf "."
+  echo "setup_route default $ROUTER" >>${ALTROOT}/etc/sysding.conf
+  printf "."
+  while [ "$dneed" -ne "0" ]; do printf "."; dneed=`expr ${dneed} - 1`; done
+fi
+(cd ${ALTROOT}/etc/svc/profile; ln -s generic_limited_net.xml generic.xml)
+echo " done"
+
+if [ "$nfs4dom" ]; then
+  printf "Configure NFSv4 Domain Name...................."
+  echo "setup_nfs4domain $nfs4dom" >>${ALTROOT}/etc/sysding.conf
+  echo " done"
+fi
+
+if [ -n "$DNSDOMAIN" ]; then
+  printf "Configure DNS name-service..."
+  # add the search directive to resolv.conf.
+  echo "domain  $DNSDOMAIN" >${ALTROOT}/etc/resolv.conf
+  printf "..."
+  echo "search $DNSDOMAIN" >>${ALTROOT}/etc/resolv.conf
+  printf "..."
+  for srv in $DNSSRV
+  do
+    echo "nameserver  $srv" >>${ALTROOT}/etc/resolv.conf
+  done
+  chown netadm:netadm ${ALTROOT}/etc/resolv.conf
+  printf "...."
+  cp -p ${ALTROOT}/etc/nsswitch.dns ${ALTROOT}/etc/nsswitch.conf
+  printf "....."
+  (cd ${ALTROOT}/etc/svc/profile; ln -s ns_dns.xml name_service.xml)
+  printf "..."
+  echo " done"
+fi
+
+printf "Configure users/groups......"
+echo $RLINE >${ALTROOT}/etc/shadow
+printf "....."
+/usr/bin/sed "/^root/d" /mnt/misc/etc/shadow >>${ALTROOT}/etc/shadow
+printf "....."
+echo "${lname}:${UHASH}:${SETPW}::::::" >>${ALTROOT}/etc/shadow
+printf "."
+/usr/bin/chmod 0400 ${ALTROOT}/etc/shadow
+printf "....."
+/usr/bin/chgrp sys ${ALTROOT}/etc/shadow
+echo "${lname}:x:${uid}:${gid}:${rname}:/export/home/${lname}:/usr/bin/bash" >>${ALTROOT}/etc/passwd
+printf "..."
+echo " done"
+
+printf "Add login: $lname to RBAC"
+echo "${lname}::::roles=root" >>${ALTROOT}/etc/user_attr
+dneed=`expr 28 - ${ulenght}`
+while [ "$dneed" -ne "0" ]; do printf "."; dneed=`expr ${dneed} - 1`; done
+echo " done"
+
+if [ "$DO_RBAC" = yes ]; then
+  printf "Converting root account to role................"
+  /usr/bin/sed "/^root/d" ${ALTROOT}/etc/user_attr >/tmp/user_attr.$$
+  printf "root::::min_label=admin_low;lock_after_retries=no;" >>/tmp/user_attr.$$
+  printf "auths=solaris.*,solaris.grant;audit_flags=lo\\" >>/tmp/user_attr.$$
+  echo ":no;profiles=All;clearance=admin_high;type=role" >>/tmp/user_attr.$$
+  mv /tmp/user_attr.$$ ${ALTROOT}/etc/user_attr
+  /usr/bin/chgrp sys ${ALTROOT}/etc/user_attr
+  print " done"
+fi
+
+printf "Add HOME for user: ${lname}"
+/usr/bin/mkdir ${ALTROOT}/export/home/${lname}
+cp -p /etc/skel/.bashrc ${ALTROOT}/export/home/$lname
+(cd ${ALTROOT}/export/home; /usr/bin/chown -R ${lname}:${gid} $lname)
+/usr/sbin/zfs umount ${pool_name}/export/home
+/usr/sbin/zfs umount ${pool_name}/export
+dneed=`expr 28 - ${ulenght}`
+while [ "$dneed" -ne "0" ]; do printf "."; dneed=`expr ${dneed} - 1`; done
+echo " done"
+
+printf "Add group: users with GID ${gid}"
+echo "users::${gid}:" >>${ALTROOT}/etc/group
+echo "................. done"
+
+# general packages we don't want on the installed system.
+DPKG="system/install/media/internal system/install/text-install system/install"
+
+# now gather some unwanted packages/services on a platform basis,
+# just a start - can't be complete right now.
+KARCH=`/sbin/uname -m`
+if [ "$KARCH" = sun4u ]; then
+  DPKG="$DPKG system/kernel/cpu/sun4v"
+fi
+if [ "$ARCH" = sparc ]; then
+  PLATFORM=`/sbin/uname -i`
+  if [ "$PLATFORM" != "SUNW,Sun-Fire-880" ] || [ "$PLATFORM" != "SUNW,Sun-Fire-V890" ]; then
+    DPKG="$DPKG system/kernel/dynamic-reconfiguration/sun-fire-880"
+  fi
+  if [ "$PLATFORM" != "SUNW,Sun-Fire-15000" ]; then
+    DPKG="$DPKG system/kernel/dynamic-reconfiguration/sun-fire-15000"
+  fi
+  if [ "$PLATFORM" != "SUNW,Sun-Fire-15000" ] || [ "$PLATFORM" != "SUNW,SPARC-Enterprise" ]; then
+    DPKG="$DPKG service/key-management/sun-fire-15000"
+  fi
+  # configure IPsec on SPARC M-Class servers for ppp communication.
+  if [ "$PLATFORM" = "SUNW,SPARC-Enterprise" ]; then
+    XSCF=`/usr/platform/${PLATFORM}/sbin/prtdscp | awk '/^SP/ {print $3}'`
+    DOMADDR=`/usr/platform/${PLATFORM}/sbin/prtdscp | awk '/^Domain/ {print $3}'`
+    if [ -n "$XSCF" ] && [ -n "$DOMADDR" ]; then
+      echo "{laddr $DOMADDR raddr $XSCF} ipsec" >${ALTROOT}/etc/inet/ipsecinit.conf
+      echo "    {encr_algs aes encr_auth_algs sha256 sa shared}" >>${ALTROOT}/etc/inet/ipsecinit.conf
+    fi
+  fi
+fi
+
+printf "Uninstalling unwanted packages................."
+/usr/bin/pkg -R ${ALTROOT} uninstall -q --no-backup-be $DPKG
+echo " done"
+
+if [ -n "$addsw" ]; then
+  printf "\nChecking userland-incorporation..."
+  ULNOW=`pkg list consolidation/userland/userland-incorporation | \
+        /usr/bin/nawk '/userland-incorporation/ {
+                gsub("^.*[0-9,0-9,0-9,0-9].0.0.","");
+                print $1}'`
+  ULREP=`pkg list -af consolidation/userland/userland-incorporation@latest | \
+        /usr/bin/nawk '/userland-incorporation/ {
+                gsub("^.*[0-9,0-9,0-9,0-9].0.0.","");
+                print $1}'`
+  if [ "$ULNOW" -lt "$ULREP" ]; then
+    print " - update needed"
+    print "Updating consolidation/userland/userland-incorporation..."
+    /usr/bin/pkg -R ${ALTROOT} update --no-backup-be consolidation/userland/userland-incorporation
+  else
+    echo " done"
+  fi
+  printf "\nCreating package dependencies"
+  for i in $addsw
+  do
+    /usr/bin/pkg contents -rm $i | nawk '/^depend/ {
+	gsub("^.*fmri=","");
+	gsub("@.*","");
+	gsub("pkg:/","");
+	print $1
+    }' >>/tmp/pkgs1.depend
+    printf "."
+  done
+  echo "consolidation/l10n/l10n-incorporation" >>/tmp/pkgs1.depend
+  # this dirty hack is need because of realy bad designed package names.
+  ISIN=`grep -c "network/dns/bind" /tmp/pkgs1.depend`
+  [ "$ISIN" -ge "1" ] && echo "network/dns/bind" >>/tmp/pkgs.add
+  ISIN=`grep -c "gnome/gnome-keyring" /tmp/pkgs1.depend`
+  [ "$ISIN" -ge "1" ] && echo "gnome/gnome-keyring" >>/tmp/pkgs.add
+  ISIN=`grep -c "network/ssh" /tmp/pkgs1.depend`
+  [ "$ISIN" -ge "1" ] && echo "network/ssh" >>/tmp/pkgs.add
+  ISIN=`grep -c "network/telnet" /tmp/pkgs1.depend`
+  [ "$ISIN" -ge "1" ] && echo "network/telnet" >>/tmp/pkgs.add
+  printf "."
+  sed \
+	-e "/_install/d" \
+	-e "/gnome\/gnome-keyring/d" \
+	-e "/network\/dns\/bind/d" \
+	-e "/network\/telnet/d" \
+	-e "/network\/ssh/d" /tmp/pkgs1.depend >/tmp/pkgs2.depend
+  printf "."
+  if [ -f /tmp/pkgs.add ]; then
+    for i in `cat /tmp/pkgs.add`
+    do
+      /usr/bin/pkg info -r $i | nawk '/FMRI:/ {gsub("^.*.org/",""); print $0}' >>/tmp/pkgs2.depend
+      printf "."
+    done
+  fi
+  /usr/bin/sort -u /tmp/pkgs2.depend >/tmp/pkgs1.depend
+  rm -f /tmp/pkgs2.depend /tmp/pkgs.add
+  printf "."
+  for i in `cat /tmp/pkgs1.depend`
+  do
+    printf "$i " >>/tmp/pkgs.depend
+  done
+  echo "" >>/tmp/pkgs.depend
+  rm -f /tmp/pkgs1.depend
+  echo " done."
+  print "Installing: ${UPD}..."
+  /usr/bin/pkg -R ${ALTROOT} install --no-backup-be `cat /tmp/pkgs.depend`
+  rm /tmp/pkgs.depend
+fi
+
+if [ "$dev" = "yes" ]; then
+  print "\nAdding OI-Software Maintainer Role for: $lname"
+  dneed=11
+  sed "/^${lname}/d" ${ALTROOT}/etc/user_attr >/tmp/user_attr.$$
+  awk '/^'"$lname"'/ {
+        print $0 ";type=normal;profiles=Software Installation"}' ${ALTROOT}/etc/user_attr \
+        >>/tmp/user_attr.$$
+  mv /tmp/user_attr.$$ ${ALTROOT}/etc/user_attr
+  chgrp sys ${ALTROOT}/etc/user_attr
+fi
+
+# set default boot device.
+if [ "$ARCH" = "sparc" ]; then
+  printf "\nSetting OBP default boot-device"
+  # first find out if we have installed to a SCSI controller on a SUNW,Ultra-5_10.
+  case $PLATFORM in
+    SUNW,Ultra-5_10|SUNW,Sun-Blade-100)
+      IDE=`ls -al /dev/dsk/$instslice | grep -c sd`
+      if [ "$IDE" = 0 ]; then
+        OBPDEV=`ls -al /dev/dsk/$instslice | \
+        /usr/bin/nawk '{
+            sub("^.*../../devices","");
+            sub("dad","disk");
+            print $0}'`
+      else
+        OBPDEV=`ls -al /dev/dsk/$instslice | \
+        /usr/bin/nawk '{
+            sub("^.*../../devices","");
+            print $0}'`
+      fi
+    ;;
+    *)
+      OBPDEV=`ls -al /dev/dsk/$instslice | \
+        /usr/bin/nawk '{
+            sub("^.*../../devices","");
+            sub("ssd","disk");
+            sub("sd","disk");
+            print $0}'`
+    ;;
+  esac
+  if [ -n "$mirror" ]; then
+    case $PLATFORM in
+      SUNW,Ultra-5_10|SUNW,Sun-Blade-100)
+        if [ "$IDE" = 0 ]; then
+          MIRRDEV=`ls -al /dev/dsk/$mirrslice | \
+          /usr/bin/nawk '{
+            sub("^.*../../devices","");
+            sub("dad","disk");
+            print $0}'`
+        else
+          MIRRDEV=`ls -al /dev/dsk/$mirrslice | \
+          /usr/bin/nawk '{
+            sub("^.*../../devices","");
+            print $0}'`
+        fi
+      ;;
+      *)
+        MIRRDEV=`ls -al /dev/dsk/$mirrslice | \
+        /usr/bin/nawk '{
+            sub("^.*../../devices","");
+            sub("ssd","disk");
+            sub("sd","disk");
+            print $0}'`
+      ;;
+    esac
+      /usr/sbin/eeprom "boot-device=$OBPDEV $MIRRDEV"
+  else
+    /usr/sbin/eeprom "boot-device=$OBPDEV"
+  fi
+  dneed=16
+  while [ "$dneed" -ne "0" ]; do printf "."; dneed=`expr ${dneed} - 1`; done
+  echo " done"
+  if [ -n "$mirror" ]; then
+    print "Install Bootblocks on: ${instslice}/${mirrslice}"
+    /usr/sbin/installboot -f -F zfs /usr/platform/`uname -i`/lib/fs/zfs/bootblk "/dev/rdsk/${instslice}"
+    /usr/sbin/installboot -f -F zfs /usr/platform/`uname -i`/lib/fs/zfs/bootblk "/dev/rdsk/${mirrslice}"
+  else
+    print "Installing Bootblock on: $instslice"
+    /usr/sbin/installboot -f -F zfs /usr/platform/`uname -i`/lib/fs/zfs/bootblk "/dev/rdsk/${instslice}"
+  fi
+else
+  if [ -n "$mirror" ]; then
+    printf "\nInstalling Bootblocks on: $instslice/${mirrslice}"
+    /usr/sbin/installboot -f -m /boot/pmbr /boot/gptzfsboot "/dev/rdsk/${instslice}"
+    /usr/sbin/installboot -f -m /boot/pmbr /boot/gptzfsboot "/dev/rdsk/${mirrslice}"
+  else
+    printf "\nInstalling Bootblock on: $instslice"
+    /usr/sbin/installboot -f -m /boot/pmbr /boot/gptzfsboot "/dev/rdsk/${instslice}"
+  fi
+fi
+
+printf "Configuring devices..."
+${ALTROOT}/usr/sbin/devfsadm -r ${ALTROOT}
+touch ${ALTROOT}/reconfigure
+echo " done"
+
+/sbin/bootadm update-archive -R ${ALTROOT} -F cpio
+
+# umount all ZFS filesystems, to be able to set new mountpoint properties.
+printf "Umounting all ZFS filesystems..."
+/usr/bin/sleep 5
+/usr/sbin/zfs unmount -f -a
+echo " done"
+
+# set final mountpoints for all ZFS filesystems.
+printf "Set final mountpoint properties for all ZFS filesystems..."
+/usr/sbin/zfs set canmount=noauto "${pool_name}/ROOT/openindiana"
+/usr/sbin/zfs set mountpoint=/ "${pool_name}/ROOT/openindiana" 2>/dev/null
+/usr/sbin/zfs set mountpoint=/var "${pool_name}/ROOT/openindiana/var" 2>/dev/null
+/usr/sbin/zfs set mountpoint=/export "${pool_name}/export"
+/usr/sbin/zfs set mountpoint=/export/home "${pool_name}/export/home"
+echo " done"
+
+printf "\n\tInstallation done: "
+date
+print "\tRebooting now, please stand by...\n"
+/usr/sbin/reboot
diff --git a/usr/src/cmd/text-install/svc/text-mode-menu.ksh b/usr/src/cmd/text-install/svc/text-mode-menu.ksh
old mode 100644
new mode 100755
index 484b9186..e5307d88
--- a/usr/src/cmd/text-install/svc/text-mode-menu.ksh
+++ b/usr/src/cmd/text-install/svc/text-mode-menu.ksh
@@ -30,7 +30,14 @@ export TEXTDOMAIN="SUNW_INSTALL_TEXT_MENU"
 export LOGNAME=`/usr/bin/logname`
 
 # Block all signals which could terminate the menu or return to a parent process
-trap "" TSTP INT TERM ABRT QUIT
+arch=`/sbin/uname -p`
+if [[ "$arch" == "sparc" ]]; then
+	trap "" TSTP TERM ABRT QUIT
+	installer="/sbin/text-install"
+else
+	trap "" TSTP INT TERM ABRT QUIT
+	installer="/usr/bin/text-install"
+fi
 
 # Determine which shell program to use by grabbing this user's login-shell
 # from /etc/passwd
@@ -45,7 +52,7 @@ fi
 # Define the menu of commands and prompts
 menu_items=( \
     (menu_str=`gettext "Install OpenIndiana"`			 \
-	cmds=("/usr/bin/text-install")					 \
+	cmds=("$installer")					 \
 	do_subprocess="true"						 \
 	msg_str="")							 \
     (menu_str=`gettext "Install Additional Drivers"`			 \
@@ -89,7 +96,6 @@ function update_term_menu_str
 function set_term_type
 {
     export TERM=xterm
-    arch=`/sbin/uname -p`
     if [[ "${arch}" = "sparc" ]] ; then
 	output_device=`/usr/sbin/prtconf -vp | 			\
 		/usr/bin/grep "output-device" | 		\
diff --git a/usr/src/pkg/manifests/install-distribution-constructor.p5m b/usr/src/pkg/manifests/install-distribution-constructor.p5m
index b94e10a8..b7be1af7 100644
--- a/usr/src/pkg/manifests/install-distribution-constructor.p5m
+++ b/usr/src/pkg/manifests/install-distribution-constructor.p5m
@@ -68,6 +68,7 @@ dir  path=usr/share/distro_const
 file path=usr/share/distro_const/DC-manifest.defval.xml group=sys mode=0444
 file path=usr/share/distro_const/DC-manifest.rng group=sys mode=0444
 file path=usr/share/distro_const/boot_archive_archive.py mode=0555
+file path=usr/share/distro_const/boot_archive_compress_usr mode=0555
 file path=usr/share/distro_const/boot_archive_configure mode=0555
 file path=usr/share/distro_const/boot_archive_initialize.py mode=0555
 file path=usr/share/distro_const/create_iso mode=0555
diff --git a/usr/src/pkg/manifests/system-install-text-install.p5m b/usr/src/pkg/manifests/system-install-text-install.p5m
index 6ded7774..983eb655 100644
--- a/usr/src/pkg/manifests/system-install-text-install.p5m
+++ b/usr/src/pkg/manifests/system-install-text-install.p5m
@@ -42,6 +42,7 @@ file path=opt/install-test/bin/ict_test mode=0555
 dir  path=usr group=sys
 dir  path=usr/bin
 file path=usr/bin/text-install group=sys mode=0555
+file path=sbin/text-install group=sys mode=0555
 dir  path=usr/lib
 dir  path=usr/lib/python$(PYVER)
 dir  path=usr/lib/python$(PYVER)/vendor-packages