6979576 Use auto_install and server_install clusters in DC manifests
authorKeith Mitchell <keith.mitchell@oracle.com>
Sun, 03 Oct 2010 07:45:56 -0700
changeset 888 91008c259ab4
parent 887 02e96272c21e
child 889 0c4a5d45edf0
6979576 Use auto_install and server_install clusters in DC manifests
usr/src/cmd/distro_const/auto_install/ai_sparc_image.xml
usr/src/cmd/distro_const/auto_install/ai_x86_image.xml
usr/src/cmd/distro_const/text_install/text_mode_sparc.xml
usr/src/cmd/distro_const/text_install/text_mode_x86.xml
--- a/usr/src/cmd/distro_const/auto_install/ai_sparc_image.xml	Fri Oct 01 10:52:22 2010 -0400
+++ b/usr/src/cmd/distro_const/auto_install/ai_sparc_image.xml	Sun Oct 03 07:45:56 2010 -0700
@@ -281,188 +281,21 @@
 			    <pkg name="pkg:/[email protected]#/>
 			-->
 			<pkg name="pkg:/entire"/>
-			<pkg name="pkg:/SUNWcs"/>
-			<pkg name="pkg:/SUNWcsd"/>
-			<pkg name="pkg:/compress/bzip2"/>
-			<pkg name="pkg:/compress/gzip"/>
-			<pkg name="pkg:/compress/p7zip"/>
-			<pkg name="pkg:/compress/unzip"/>
-			<pkg name="pkg:/compress/zip"/>
-			<pkg name="pkg:/data/iso-codes"/>
-			<pkg name="pkg:/developer/debug/mdb"/>
-			<pkg name="pkg:/developer/debug/mdb/module/module-fibre-channel"/>
-			<pkg name="pkg:/developer/debug/mdb/module/module-qlc"/>
-			<pkg name="pkg:/developer/dtrace"/>
-			<pkg name="pkg:/developer/dtrace/toolkit"/>
-			<pkg name="pkg:/developer/linker"/>
-			<pkg name="pkg:/developer/macro/cpp"/>
-			<pkg name="pkg:/developer/object-file"/>
-			<pkg name="pkg:/diagnostic/cpu-counters"/>
-			<pkg name="pkg:/diagnostic/ddu/library"/>
-			<pkg name="pkg:/driver/cpu/us"/>
-			<pkg name="pkg:/driver/crypto/n2cp"/>
-			<pkg name="pkg:/driver/crypto/tpm"/>
-			<pkg name="pkg:/driver/firewire"/>
-			<pkg name="pkg:/driver/network/afe"/>
-			<pkg name="pkg:/driver/network/bge"/>
-			<pkg name="pkg:/driver/network/bpf"/>
-			<pkg name="pkg:/driver/network/ce"/>
-			<pkg name="pkg:/driver/network/chxge"/>
-			<pkg name="pkg:/driver/network/dmfe"/>
-			<pkg name="pkg:/driver/network/e1000g"/>
-			<pkg name="pkg:/driver/network/emlxs"/>
-			<pkg name="pkg:/driver/network/eri"/>
-			<pkg name="pkg:/driver/network/fcip"/>
-			<pkg name="pkg:/driver/network/fcp"/>
-			<pkg name="pkg:/driver/network/fcsm"/>
-			<pkg name="pkg:/driver/network/fp"/>
-			<pkg name="pkg:/driver/network/ge"/>
-			<pkg name="pkg:/driver/network/hme"/>
-			<pkg name="pkg:/driver/network/hxge"/>
-			<pkg name="pkg:/driver/network/ib"/>
-			<pkg name="pkg:/driver/network/ibd"/>
-			<pkg name="pkg:/driver/network/igb"/>
-			<pkg name="pkg:/driver/network/ixgb"/>
-			<pkg name="pkg:/driver/network/ixgbe"/>
-			<pkg name="pkg:/driver/network/llc2"/>
-			<pkg name="pkg:/driver/network/mxfe"/>
-			<pkg name="pkg:/driver/network/myri10ge"/>
-			<pkg name="pkg:/driver/network/niumx"/>
-			<pkg name="pkg:/driver/network/nxge"/>
-			<pkg name="pkg:/driver/network/pcan"/>
-			<pkg name="pkg:/driver/network/pcwl"/>
-			<pkg name="pkg:/driver/network/qfe"/>
-			<pkg name="pkg:/driver/network/qlc"/>
-			<pkg name="pkg:/driver/network/rge"/>
-			<pkg name="pkg:/driver/network/rpcib"/>
-			<pkg name="pkg:/driver/network/sdp"/>
-			<pkg name="pkg:/driver/network/sdpib"/>
-			<pkg name="pkg:/driver/network/sfe"/>
-			<pkg name="pkg:/driver/network/socal"/>
-			<pkg name="pkg:/driver/network/tavor"/>
-			<pkg name="pkg:/driver/network/vr"/>
-			<pkg name="pkg:/driver/network/xge"/>
-			<pkg name="pkg:/driver/network/yge"/>
-			<pkg name="pkg:/driver/pcmcia"/>
-			<pkg name="pkg:/driver/serial/pcser"/>
-			<pkg name="pkg:/driver/serial/usbftdi"/>
-			<pkg name="pkg:/driver/serial/usbsacm"/>
-			<pkg name="pkg:/driver/serial/usbser_edge"/>
-			<pkg name="pkg:/driver/serial/usbser"/>
-			<pkg name="pkg:/driver/serial/usbsksp"/>
-			<pkg name="pkg:/driver/serial/usbsksp/usbs49_fw"/>
-			<pkg name="pkg:/driver/serial/usbsprl"/>
-			<pkg name="pkg:/driver/sparc/platform"/>
-			<pkg name="pkg:/driver/storage/aac"/>
-			<pkg name="pkg:/driver/storage/mpt_sas"/>
-			<pkg name="pkg:/driver/storage/mr_sas"/>
-			<pkg name="pkg:/driver/storage/pcata"/>
-			<pkg name="pkg:/driver/storage/pmcs"/>
-			<pkg name="pkg:/driver/storage/sbp2"/>
-			<pkg name="pkg:/driver/storage/scsa1394"/>
-			<pkg name="pkg:/driver/storage/sdcard"/>
-			<pkg name="pkg:/driver/storage/ses"/>
-			<pkg name="pkg:/driver/storage/sf"/>
-			<pkg name="pkg:/driver/storage/smp"/>
-			<pkg name="pkg:/driver/storage/ssd"/>
-			<pkg name="pkg:/driver/usb"/>
-			<pkg name="pkg:/driver/usb/ugen"/>
-			<pkg name="pkg:/library/libtecla"/>
-			<pkg name="pkg:/library/libxml2"/>
-			<pkg name="pkg:/library/libxslt"/>
-			<pkg name="pkg:/library/security/openssl"/>
-			<pkg name="pkg:/library/zlib"/>
-			<pkg name="pkg:/media/cdrtools"/>
-			<pkg name="pkg:/network/ftp"/>
-			<pkg name="pkg:/network/ipfilter"/>
-			<pkg name="pkg:/network/iscsi/initiator"/>
-			<pkg name="pkg:/network/rsync"/>
-			<pkg name="pkg:/network/ssh"/>
-			<pkg name="pkg:/network/ssh/ssh-key"/>
-			<pkg name="pkg:/network/telnet"/>
-			<pkg name="pkg:/package/pkg"/>
-			<pkg name="pkg:/package/svr4"/>
-			<pkg name="pkg:/release/name"/>
-			<pkg name="pkg:/service/fault-management"/>
-			<pkg name="pkg:/service/key-management/sun-fire-15000"/>
-			<pkg name="pkg:/service/management/sysidtool"/>
-			<pkg name="pkg:/service/network/dns/mdns"/>
-			<pkg name="pkg:/service/network/network-clients"/>
-			<pkg name="pkg:/service/network/network-servers"/>
-			<pkg name="pkg:/service/network/ntp"/>
-			<pkg name="pkg:/service/network/smtp/sendmail"/>
-			<pkg name="pkg:/service/network/ssh"/>
-			<pkg name="pkg:/service/network/tftp"/>
-			<pkg name="pkg:/service/network/wpa"/>
-			<pkg name="pkg:/service/picl"/>
-			<pkg name="pkg:/service/resource-pools"/>
-			<pkg name="pkg:/service/security/kerberos-5"/>
-			<pkg name="pkg:/service/storage/fibre-channel/fc-fabric"/>
-			<pkg name="pkg:/service/storage/removable-media"/>
-			<pkg name="pkg:/shell/bash"/>
-			<pkg name="pkg:/storage/mpathadm"/>
-			<pkg name="pkg:/storage/svm"/>
-			<pkg name="pkg:/system/accounting/legacy"/>
-			<pkg name="pkg:/system/boot/wanboot"/>
-			<pkg name="pkg:/system/data/keyboard/keytables"/>
-			<pkg name="pkg:/system/data/terminfo"/>
-			<pkg name="pkg:/system/domain-service-processor-protocol/sparc-enterprise"/>
-			<pkg name="pkg:/system/embedded-fcode-interpreter"/>
-			<pkg name="pkg:/system/extended-system-utilities"/>
-			<pkg name="pkg:/system/file-system/autofs"/>
-			<pkg name="pkg:/system/file-system/nfs"/>
-			<pkg name="pkg:/system/file-system/smb"/>
-			<pkg name="pkg:/system/file-system/udfs"/>
-			<pkg name="pkg:/system/file-system/zfs"/>
-			<pkg name="pkg:/system/flash/fwflash"/>
-			<pkg name="pkg:/system/install"/>
-			<pkg name="pkg:/system/install/auto-install"/>
-			<pkg name="pkg:/system/install/media/internal"/>
-			<pkg name="pkg:/system/install/tests"/>
-			<pkg name="pkg:/system/kernel"/>
-			<pkg name="pkg:/system/kernel/cpu-counters"/>
-			<pkg name="pkg:/system/kernel/cpu/sun4v"/>
-			<pkg name="pkg:/system/kernel/dtrace/providers"/>
-			<pkg name="pkg:/system/kernel/dynamic-reconfiguration/sun-fire-15000"/>
-			<pkg name="pkg:/system/kernel/dynamic-reconfiguration/ultra-enterprise-10000"/>
-			<pkg name="pkg:/system/kernel/inter-domain/ultra-enterprise-10000"/>
-			<pkg name="pkg:/system/kernel/io-performance-counters"/>
-			<pkg name="pkg:/system/kernel/platform"/>
-			<pkg name="pkg:/system/kernel/platform/netra"/>
-			<pkg name="pkg:/system/kernel/power"/>
-			<pkg name="pkg:/system/kernel/suspend-resume"/>
-			<pkg name="pkg:/system/kernel/ultra-wideband"/>
-			<pkg name="pkg:/system/ldoms"/>
-			<pkg name="pkg:/system/library"/>
-			<pkg name="pkg:/system/library/iconv/xsh4/eastern-european"/>
-			<pkg name="pkg:/system/library/install"/>
-			<pkg name="pkg:/system/library/mozilla-nss"/>
-			<pkg name="pkg:/system/library/platform"/>
-			<pkg name="pkg:/system/library/processor"/>
-			<pkg name="pkg:/system/library/storage/fibre-channel/hbaapi"/>
-			<pkg name="pkg:/system/library/storage/fibre-channel/libsun_fc"/>
-			<pkg name="pkg:/system/library/storage/libmpscsi_vhci"/>
-			<pkg name="pkg:/system/library/sysidtool"/>
-			<pkg name="pkg:/system/management/sysidtool"/>
-			<pkg name="pkg:/system/network-console"/>
-			<pkg name="pkg:/system/network"/>
-			<pkg name="pkg:/system/network/nis"/>
-			<pkg name="pkg:/system/network/routing"/>
-			<pkg name="pkg:/system/network/spdadm"/>
-			<pkg name="pkg:/system/network/wificonfig"/>
-			<pkg name="pkg:/system/prerequisite/gnu"/>
-			<pkg name="pkg:/system/scheduler/fss"/>
-			<pkg name="pkg:/system/storage/fibre-channel/port-utility"/>
-			<pkg name="pkg:/system/storage/luxadm"/>
-			<pkg name="pkg:/system/xopen/xcu4"/>
-			<pkg name="pkg:/system/zones"/>
-			<pkg name="pkg:/text/locale"/>
-			<pkg name="pkg:/web/wget"/>
+			<pkg name="pkg:/auto_install"/>
 		</packages>
 <!--
      Items below this line are rarely configured
 -->
 		<!--
+		    auto_install is a group package used to define the
+		    default installation. It is removed here so that it does
+		    not inhibit removal of other packages on the
+		    installed system.
+		--> 
+		<post_install_remove_packages>
+			<pkg name="pkg:/auto_install"/>
+		</post_install_remove_packages>
+		<!--
 		     If/how to compress the live image.
 		     type = compression algorithm to use for pkg.zlib and misc.zlib.
 		     Valid types are lzma, gzip, and none.
--- a/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml	Fri Oct 01 10:52:22 2010 -0400
+++ b/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml	Sun Oct 03 07:45:56 2010 -0700
@@ -296,215 +296,21 @@
 			    <pkg name="pkg:/[email protected]#/>
 			-->
 			<pkg name="pkg:/entire"/>
-			<pkg name="pkg:/SUNWcs"/>
-			<pkg name="pkg:/SUNWcsd"/>
-			<pkg name="pkg:/compress/bzip2"/>
-			<pkg name="pkg:/compress/gzip"/>
-			<pkg name="pkg:/compress/p7zip"/>
-			<pkg name="pkg:/compress/unzip"/>
-			<pkg name="pkg:/compress/zip"/>
-			<pkg name="pkg:/data/iso-codes"/>
-			<pkg name="pkg:/developer/debug/mdb"/>
-			<pkg name="pkg:/developer/debug/mdb/module/module-fibre-channel"/>
-			<pkg name="pkg:/developer/debug/mdb/module/module-qlc"/>
-			<pkg name="pkg:/developer/dtrace"/>
-			<pkg name="pkg:/developer/dtrace/toolkit"/>
-			<pkg name="pkg:/developer/linker"/>
-			<pkg name="pkg:/developer/macro/cpp"/>
-			<pkg name="pkg:/developer/object-file"/>
-			<pkg name="pkg:/diagnostic/cpu-counters"/>
-			<pkg name="pkg:/diagnostic/ddu/library"/>
-			<pkg name="pkg:/driver/crypto/tpm"/>
-			<pkg name="pkg:/driver/firewire"/>
-			<pkg name="pkg:/driver/graphics/agpgart"/>
-			<pkg name="pkg:/driver/graphics/atiatom"/>
-			<pkg name="pkg:/driver/graphics/drm"/>
-			<pkg name="pkg:/driver/i86pc/fipe"/>
-			<pkg name="pkg:/driver/i86pc/ioat"/>
-			<pkg name="pkg:/driver/i86pc/platform"/>
-			<pkg name="pkg:/driver/network/afe"/>
-			<pkg name="pkg:/driver/network/amd8111s"/>
-			<pkg name="pkg:/driver/network/arn"/>
-			<pkg name="pkg:/driver/network/atge"/>
-			<pkg name="pkg:/driver/network/ath"/>
-			<pkg name="pkg:/driver/network/atu"/>
-			<pkg name="pkg:/driver/network/bfe"/>
-			<pkg name="pkg:/driver/network/bge"/>
-			<pkg name="pkg:/driver/network/bnx"/>
-			<pkg name="pkg:/driver/network/bnxe"/>
-			<pkg name="pkg:/driver/network/bpf"/>
-			<pkg name="pkg:/driver/network/ce"/>
-			<pkg name="pkg:/driver/network/chxge"/>
-			<pkg name="pkg:/driver/network/dmfe"/>
-			<pkg name="pkg:/driver/network/e1000g"/>
-			<pkg name="pkg:/driver/network/fcip"/>
-			<pkg name="pkg:/driver/network/fcp"/>
-			<pkg name="pkg:/driver/network/fcsm"/>
-			<pkg name="pkg:/driver/network/fp"/>
-			<pkg name="pkg:/driver/network/hxge"/>
-			<pkg name="pkg:/driver/network/ib"/>
-			<pkg name="pkg:/driver/network/ibd"/>
-			<pkg name="pkg:/driver/network/igb"/>
-			<pkg name="pkg:/driver/network/ipw"/>
-			<pkg name="pkg:/driver/network/iwh"/>
-			<pkg name="pkg:/driver/network/iwi"/>
-			<pkg name="pkg:/driver/network/iwk"/>
-			<pkg name="pkg:/driver/network/iwp"/>
-			<pkg name="pkg:/driver/network/ixgb"/>
-			<pkg name="pkg:/driver/network/ixgbe"/>
-			<pkg name="pkg:/driver/network/mwl"/>
-			<pkg name="pkg:/driver/network/mxfe"/>
-			<pkg name="pkg:/driver/network/myri10ge"/>
-			<pkg name="pkg:/driver/network/nge"/>
-			<pkg name="pkg:/driver/network/ntxn"/>
-			<pkg name="pkg:/driver/network/nxge"/>
-			<pkg name="pkg:/driver/network/pcan"/>
-			<pkg name="pkg:/driver/network/pcwl"/>
-			<pkg name="pkg:/driver/network/platform"/>
-			<pkg name="pkg:/driver/network/qlc"/>
-			<pkg name="pkg:/driver/network/ral"/>
-			<pkg name="pkg:/driver/network/rge"/>
-			<pkg name="pkg:/driver/network/rpcib"/>
-			<pkg name="pkg:/driver/network/rtls"/>
-			<pkg name="pkg:/driver/network/rtw"/>
-			<pkg name="pkg:/driver/network/rum"/>
-			<pkg name="pkg:/driver/network/rwd"/>
-			<pkg name="pkg:/driver/network/rwn"/>
-			<pkg name="pkg:/driver/network/sdp"/>
-			<pkg name="pkg:/driver/network/sdpib"/>
-			<pkg name="pkg:/driver/network/sfe"/>
-			<pkg name="pkg:/driver/network/tavor"/>
-			<pkg name="pkg:/driver/network/uath"/>
-			<pkg name="pkg:/driver/network/ural"/>
-			<pkg name="pkg:/driver/network/urtw"/>
-			<pkg name="pkg:/driver/network/vr"/>
-			<pkg name="pkg:/driver/network/wpi"/>
-			<pkg name="pkg:/driver/network/xge"/>
-			<pkg name="pkg:/driver/network/yge"/>
-			<pkg name="pkg:/driver/network/zyd"/>
-			<pkg name="pkg:/driver/pcmcia"/>
-			<pkg name="pkg:/driver/serial/pcser"/>
-			<pkg name="pkg:/driver/serial/usbftdi"/>
-			<pkg name="pkg:/driver/serial/usbsacm"/>
-			<pkg name="pkg:/driver/serial/usbser_edge"/>
-			<pkg name="pkg:/driver/serial/usbser"/>
-			<pkg name="pkg:/driver/serial/usbsksp"/>
-			<pkg name="pkg:/driver/serial/usbsksp/usbs49_fw"/>
-			<pkg name="pkg:/driver/serial/usbsprl"/>
-			<pkg name="pkg:/driver/storage/aac"/>
-			<pkg name="pkg:/driver/storage/adpu320"/>
-			<pkg name="pkg:/driver/storage/ahci"/>
-			<pkg name="pkg:/driver/storage/amr"/>
-			<pkg name="pkg:/driver/storage/arcmsr"/>
-			<pkg name="pkg:/driver/storage/ata"/>
-			<pkg name="pkg:/driver/storage/bcm_sata"/>
-			<pkg name="pkg:/driver/storage/cpqary3"/>
-			<pkg name="pkg:/driver/storage/glm"/>
-			<pkg name="pkg:/driver/storage/lsimega"/>
-			<pkg name="pkg:/driver/storage/marvell88sx"/>
-			<pkg name="pkg:/driver/storage/mega_sas"/>
-			<pkg name="pkg:/driver/storage/mpt_sas"/>
-			<pkg name="pkg:/driver/storage/mr_sas"/>
-			<pkg name="pkg:/driver/storage/nv_sata"/>
-			<pkg name="pkg:/driver/storage/pcata"/>
-			<pkg name="pkg:/driver/storage/pmcs"/>
-			<pkg name="pkg:/driver/storage/sbp2"/>
-			<pkg name="pkg:/driver/storage/scsa1394"/>
-			<pkg name="pkg:/driver/storage/sdcard"/>
-			<pkg name="pkg:/driver/storage/ses"/>
-			<pkg name="pkg:/driver/storage/si3124"/>
-			<pkg name="pkg:/driver/storage/smp"/>
-			<pkg name="pkg:/driver/usb"/>
-			<pkg name="pkg:/driver/usb/ugen"/>
-			<pkg name="pkg:/driver/xvm/pv"/>
-			<pkg name="pkg:/library/libtecla"/>
-			<pkg name="pkg:/library/libxml2"/>
-			<pkg name="pkg:/library/libxslt"/>
-			<pkg name="pkg:/library/security/openssl"/>
-			<pkg name="pkg:/library/zlib"/>
-			<pkg name="pkg:/media/cdrtools"/>
-			<pkg name="pkg:/network/ftp"/>
-			<pkg name="pkg:/network/ipfilter"/>
-			<pkg name="pkg:/network/iscsi/initiator"/>
-			<pkg name="pkg:/network/rsync"/>
-			<pkg name="pkg:/network/ssh"/>
-			<pkg name="pkg:/network/ssh/ssh-key"/>
-			<pkg name="pkg:/network/telnet"/>
-			<pkg name="pkg:/package/pkg"/>
-			<pkg name="pkg:/package/svr4"/>
-			<pkg name="pkg:/release/name"/>
-			<pkg name="pkg:/service/fault-management"/>
-			<pkg name="pkg:/service/management/sysidtool"/>
-			<pkg name="pkg:/service/network/dns/mdns"/>
-			<pkg name="pkg:/service/network/network-clients"/>
-			<pkg name="pkg:/service/network/network-servers"/>
-			<pkg name="pkg:/service/network/ntp"/>
-			<pkg name="pkg:/service/network/smtp/sendmail"/>
-			<pkg name="pkg:/service/network/ssh"/>
-			<pkg name="pkg:/service/network/tftp"/>
-			<pkg name="pkg:/service/network/wpa"/>
-			<pkg name="pkg:/service/picl"/>
-			<pkg name="pkg:/service/resource-pools"/>
-			<pkg name="pkg:/service/security/kerberos-5"/>
-			<pkg name="pkg:/service/storage/fibre-channel/fc-fabric"/>
-			<pkg name="pkg:/service/storage/removable-media"/>
-			<pkg name="pkg:/shell/bash"/>
-			<pkg name="pkg:/storage/mpathadm"/>
-			<pkg name="pkg:/storage/svm"/>
-			<pkg name="pkg:/system/accounting/legacy"/>
-			<pkg name="pkg:/system/boot/grub"/>
-			<pkg name="pkg:/system/boot/real-mode"/>
-			<pkg name="pkg:/system/boot/wanboot"/>
-			<pkg name="pkg:/system/data/keyboard/keytables"/>
-			<pkg name="pkg:/system/data/terminfo"/>
-			<pkg name="pkg:/system/extended-system-utilities"/>
-			<pkg name="pkg:/system/file-system/autofs"/>
-			<pkg name="pkg:/system/file-system/nfs"/>
-			<pkg name="pkg:/system/file-system/smb"/>
-			<pkg name="pkg:/system/file-system/udfs"/>
-			<pkg name="pkg:/system/file-system/zfs"/>
-			<pkg name="pkg:/system/flash/fwflash"/>
-			<pkg name="pkg:/system/install"/>
-			<pkg name="pkg:/system/install/auto-install"/>
-			<pkg name="pkg:/system/install/media/internal"/>
-			<pkg name="pkg:/system/install/tests"/>
-			<pkg name="pkg:/system/kernel"/>
-			<pkg name="pkg:/system/kernel/cpu-counters"/>
-			<pkg name="pkg:/system/kernel/dtrace/providers"/>
-			<pkg name="pkg:/system/kernel/platform"/>
-			<pkg name="pkg:/system/kernel/power"/>
-			<pkg name="pkg:/system/kernel/suspend-resume"/>
-			<pkg name="pkg:/system/kernel/ultra-wideband"/>
-			<pkg name="pkg:/system/library"/>
-			<pkg name="pkg:/system/library/iconv/xsh4/eastern-european"/>
-			<pkg name="pkg:/system/library/install"/>
-			<pkg name="pkg:/system/library/mozilla-nss"/>
-			<pkg name="pkg:/system/library/platform"/>
-			<pkg name="pkg:/system/library/processor"/>
-			<pkg name="pkg:/system/library/storage/fibre-channel/hbaapi"/>
-			<pkg name="pkg:/system/library/storage/fibre-channel/libsun_fc"/>
-			<pkg name="pkg:/system/library/storage/libmpscsi_vhci"/>
-			<pkg name="pkg:/system/library/sysidtool"/>
-			<pkg name="pkg:/system/management/intel-amt"/>
-			<pkg name="pkg:/system/management/sysidtool"/>
-			<pkg name="pkg:/system/network"/>
-			<pkg name="pkg:/system/network/nis"/>
-			<pkg name="pkg:/system/network/routing"/>
-			<pkg name="pkg:/system/network/spdadm"/>
-			<pkg name="pkg:/system/network/wificonfig"/>
-			<pkg name="pkg:/system/prerequisite/gnu"/>
-			<pkg name="pkg:/system/scheduler/fss"/>
-			<pkg name="pkg:/system/storage/fibre-channel/port-utility"/>
-			<pkg name="pkg:/system/storage/luxadm"/>
-			<pkg name="pkg:/system/xopen/xcu4"/>
-			<pkg name="pkg:/system/zones"/>
-			<pkg name="pkg:/text/locale"/>
-			<pkg name="pkg:/web/wget"/>
+			<pkg name="pkg:/auto_install"/>
 		</packages>
 <!--
      Items below this line are rarely configured
 -->
 		<!--
+		    auto_install is a group package used to define the
+		    default installation. It is removed here so that it does
+		    not inhibit removal of other packages on the
+		    installed system.
+		--> 
+		<post_install_remove_packages>
+			<pkg name="pkg:/auto_install"/>
+		</post_install_remove_packages>
+		<!--
 		     If/how to compress the live image.
 		     type = compression algorithm to use for pkg.zlib and misc.zlib.
 		     Valid types are lzma, gzip, and none.
--- a/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml	Fri Oct 01 10:52:22 2010 -0400
+++ b/usr/src/cmd/distro_const/text_install/text_mode_sparc.xml	Sun Oct 03 07:45:56 2010 -0700
@@ -252,377 +252,23 @@
 			    <pkg name="pkg:/[email protected]#/>
 			-->
 			<pkg name="pkg:/entire"/>
-			<pkg name="pkg:/SUNWcs"/>
-			<pkg name="pkg:/SUNWcsd"/>
-			<pkg name="pkg:/archiver/gnu-tar"/>
-			<pkg name="pkg:/compress/bzip2"/>
-			<pkg name="pkg:/compress/gzip"/>
-			<pkg name="pkg:/compress/p7zip"/>
-			<pkg name="pkg:/compress/unzip"/>
-			<pkg name="pkg:/compress/zip"/>
-			<pkg name="pkg:/data/iso-codes"/>
-			<pkg name="pkg:/database/sqlite-3"/>
-			<pkg name="pkg:/developer/apptrace/platform"/>
-			<pkg name="pkg:/developer/build/make"/>
-			<pkg name="pkg:/developer/debug/mdb"/>
-			<pkg name="pkg:/developer/debug/mdb/module/module-fibre-channel"/>
-			<pkg name="pkg:/developer/debug/mdb/module/module-qlc"/>
-			<pkg name="pkg:/developer/dtrace"/>
-			<pkg name="pkg:/developer/dtrace/toolkit"/>
-			<pkg name="pkg:/developer/linker"/>
-			<pkg name="pkg:/developer/macro/cpp"/>
-			<pkg name="pkg:/developer/object-file"/>
-			<pkg name="pkg:/diagnostic/cpu-counters"/>
-			<pkg name="pkg:/diagnostic/ddu/text"/>
-			<pkg name="pkg:/diagnostic/powertop"/>
-			<pkg name="pkg:/diagnostic/scanpci"/>
-			<pkg name="pkg:/diagnostic/top"/>
-			<pkg name="pkg:/driver/cpu/us"/>
-			<pkg name="pkg:/driver/crypto/n2cp"/>
-			<pkg name="pkg:/driver/crypto/tpm"/>
-			<pkg name="pkg:/driver/firewire"/>
-			<pkg name="pkg:/driver/graphics/ast"/>
-			<pkg name="pkg:/driver/graphics/dcam1394"/>
-			<pkg name="pkg:/driver/graphics/dcam1394/devfsadm-dcam1394"/>
-			<pkg name="pkg:/driver/graphics/efb"/>
-			<pkg name="pkg:/driver/graphics/kfb"/>
-			<pkg name="pkg:/driver/network/afe"/>
-			<pkg name="pkg:/driver/network/bge"/>
-			<pkg name="pkg:/driver/network/bpf"/>
-			<pkg name="pkg:/driver/network/ce"/>
-			<pkg name="pkg:/driver/network/chxge"/>
-			<pkg name="pkg:/driver/network/dmfe"/>
-			<pkg name="pkg:/driver/network/e1000g"/>
-			<pkg name="pkg:/driver/network/emlxs"/>
-			<pkg name="pkg:/driver/network/eri"/>
-			<pkg name="pkg:/driver/network/fcip"/>
-			<pkg name="pkg:/driver/network/fcp"/>
-			<pkg name="pkg:/driver/network/fcsm"/>
-			<pkg name="pkg:/driver/network/fp"/>
-			<pkg name="pkg:/driver/network/ge"/>
-			<pkg name="pkg:/driver/network/hme"/>
-			<pkg name="pkg:/driver/network/hxge"/>
-			<pkg name="pkg:/driver/network/ib"/>
-			<pkg name="pkg:/driver/network/ibd"/>
-			<pkg name="pkg:/driver/network/igb"/>
-			<pkg name="pkg:/driver/network/ixgb"/>
-			<pkg name="pkg:/driver/network/ixgbe"/>
-			<pkg name="pkg:/driver/network/mxfe"/>
-			<pkg name="pkg:/driver/network/myri10ge"/>
-			<pkg name="pkg:/driver/network/niumx"/>
-			<pkg name="pkg:/driver/network/nxge"/>
-			<pkg name="pkg:/driver/network/qfe"/>
-			<pkg name="pkg:/driver/network/qlc"/>
-			<pkg name="pkg:/driver/network/rge"/>
-			<pkg name="pkg:/driver/network/rpcib"/>
-			<pkg name="pkg:/driver/network/sdp"/>
-			<pkg name="pkg:/driver/network/sdpib"/>
-			<pkg name="pkg:/driver/network/sfe"/>
-			<pkg name="pkg:/driver/network/socal"/>
-			<pkg name="pkg:/driver/network/tavor"/>
-			<pkg name="pkg:/driver/network/vr"/>
-			<pkg name="pkg:/driver/network/xge"/>
-			<pkg name="pkg:/driver/network/yge"/>
-			<pkg name="pkg:/driver/pcmcia"/>
-			<pkg name="pkg:/driver/serial/pcser"/>
-			<pkg name="pkg:/driver/serial/usbftdi"/>
-			<pkg name="pkg:/driver/serial/usbsacm"/>
-			<pkg name="pkg:/driver/serial/usbser_edge"/>
-			<pkg name="pkg:/driver/serial/usbser"/>
-			<pkg name="pkg:/driver/serial/usbsksp"/>
-			<pkg name="pkg:/driver/serial/usbsksp/usbs49_fw"/>
-			<pkg name="pkg:/driver/serial/usbsprl"/>
-			<pkg name="pkg:/driver/sparc/platform"/>
-			<pkg name="pkg:/driver/storage/aac"/>
-			<pkg name="pkg:/driver/storage/fas/header-fas"/>
-			<pkg name="pkg:/driver/storage/mpt_sas"/>
-			<pkg name="pkg:/driver/storage/mr_sas"/>
-			<pkg name="pkg:/driver/storage/pcata"/>
-			<pkg name="pkg:/driver/storage/pmcs"/>
-			<pkg name="pkg:/driver/storage/sbp2"/>
-			<pkg name="pkg:/driver/storage/scsa1394"/>
-			<pkg name="pkg:/driver/storage/sdcard"/>
-			<pkg name="pkg:/driver/storage/ses"/>
-			<pkg name="pkg:/driver/storage/sf"/>
-			<pkg name="pkg:/driver/storage/smp"/>
-			<pkg name="pkg:/driver/storage/ssd"/>
-			<pkg name="pkg:/driver/usb"/>
-			<pkg name="pkg:/driver/usb/ugen"/>
-			<pkg name="pkg:/editor/nano"/>
-			<pkg name="pkg:/editor/vim"/>
-			<pkg name="pkg:/file/gnu-coreutils"/>
-			<pkg name="pkg:/file/gnu-findutils"/>
-			<pkg name="pkg:/image/library/libtiff"/>
-			<pkg name="pkg:/install/beadm"/>
-			<pkg name="pkg:/install/installadm"/>
-			<pkg name="pkg:/library/aalib"/>
-			<pkg name="pkg:/library/c++/sigcpp"/>
-			<pkg name="pkg:/library/expat"/>
-			<pkg name="pkg:/library/gmp"/>
-			<pkg name="pkg:/library/gnutls"/>
-			<pkg name="pkg:/library/idnkit"/>
-			<pkg name="pkg:/library/libdaemon"/>
-			<pkg name="pkg:/library/libffi"/>
-			<pkg name="pkg:/library/libidn"/>
-			<pkg name="pkg:/library/libtasn1"/>
-			<pkg name="pkg:/library/libtecla"/>
-			<pkg name="pkg:/library/libtool/libltdl"/>
-			<pkg name="pkg:/library/libxml2"/>
-			<pkg name="pkg:/library/libxslt"/>
-			<pkg name="pkg:/library/ncurses"/>
-			<pkg name="pkg:/library/nspr"/>
-			<pkg name="pkg:/library/pcre"/>
-			<pkg name="pkg:/library/perl-5/authen-pam"/>
-			<pkg name="pkg:/library/perl-5/xml-parser"/>
-			<pkg name="pkg:/library/popt"/>
-			<pkg name="pkg:/library/print/cups-libs"/>
-			<pkg name="pkg:/library/print/open-printing"/>
-			<pkg name="pkg:/library/print/open-printing/ipp"/>
-			<pkg name="pkg:/library/print/open-printing/lpd"/>
-			<pkg name="pkg:/library/python-2/cherrypy"/>
-			<pkg name="pkg:/library/python-2/lxml-24"/>
-			<pkg name="pkg:/library/python-2/mako"/>
-			<pkg name="pkg:/library/python-2/ply"/>
-			<pkg name="pkg:/library/python-2/pycurl"/>
-			<pkg name="pkg:/library/python-2/pyopenssl-24"/>
-			<pkg name="pkg:/library/python-2/python-twisted-24"/>
-			<pkg name="pkg:/library/python-2/python-xdg-24"/>
-			<pkg name="pkg:/library/python-2/python-zope-interface-24"/>
-			<pkg name="pkg:/library/python-2/pyyaml-24"/>
-			<pkg name="pkg:/library/samba/libsmbclient"/>
-			<pkg name="pkg:/library/security/libgpg-error"/>
-			<pkg name="pkg:/library/security/openssl"/>
-			<pkg name="pkg:/library/security/tcp-wrapper"/>
-			<pkg name="pkg:/library/security/trousers"/>
-			<pkg name="pkg:/library/zlib"/>
-			<pkg name="pkg:/media/cdrtools"/>
-			<pkg name="pkg:/naming/ldap"/>
-			<pkg name="pkg:/network/bridging"/>
-			<pkg name="pkg:/network/dns/bind"/>
-			<pkg name="pkg:/network/ftp"/>
-			<pkg name="pkg:/network/ipfilter"/>
-			<pkg name="pkg:/network/iscsi/initiator"/>
-			<pkg name="pkg:/network/rsync"/>
-			<pkg name="pkg:/network/ssh"/>
-			<pkg name="pkg:/network/ssh/ssh-key"/>
-			<pkg name="pkg:/network/telnet"/>
-			<pkg name="pkg:/package/pkg"/>
-			<pkg name="pkg:/package/svr4"/>
-			<pkg name="pkg:/print/cups"/>
-			<pkg name="pkg:/print/lp"/>
-			<pkg name="pkg:/print/lp/filter/a2ps"/>
-			<pkg name="pkg:/print/lp/filter/foomatic-ppds"/>
-			<pkg name="pkg:/print/lp/filter/foomatic-rip"/>
-			<pkg name="pkg:/print/lp/filter/postscript-lp-filter"/>
-			<pkg name="pkg:/print/lp/ipp/ipp-listener"/>
-			<pkg name="pkg:/print/lp/ipp/libipp"/>
-			<pkg name="pkg:/release/copyright"/>
-			<pkg name="pkg:/release/name"/>
-			<pkg name="pkg:/runtime/perl-584"/>
-			<pkg name="pkg:/runtime/perl-584/extra"/>
-			<pkg name="pkg:/runtime/perl-584/manual"/>
-			<pkg name="pkg:/runtime/tcl-8"/>
-			<pkg name="pkg:/runtime/tk-8"/>
-			<pkg name="pkg:/security/bart"/>
-			<pkg name="pkg:/security/sudo"/>
-			<pkg name="pkg:/service/fault-management"/>
-			<pkg name="pkg:/service/file-system/nfs"/>
-			<pkg name="pkg:/service/hal"/>
-			<pkg name="pkg:/service/key-management/sun-fire-15000"/>
-			<pkg name="pkg:/service/management/sysidtool"/>
-			<pkg name="pkg:/service/network/dns/bind"/>
-			<pkg name="pkg:/service/network/dns/mdns"/>
-			<pkg name="pkg:/service/network/ftp"/>
-			<pkg name="pkg:/service/network/network-clients"/>
-			<pkg name="pkg:/service/network/network-servers"/>
-			<pkg name="pkg:/service/network/ntp"/>
-			<pkg name="pkg:/service/network/smtp/sendmail"/>
-			<pkg name="pkg:/service/network/ssh"/>
-			<pkg name="pkg:/service/network/telnet"/>
-			<pkg name="pkg:/service/network/tftp"/>
-			<pkg name="pkg:/service/picl"/>
-			<pkg name="pkg:/service/resource-pools"/>
-			<pkg name="pkg:/service/resource-pools/poold"/>
-			<pkg name="pkg:/service/security/kerberos-5"/>
-			<pkg name="pkg:/service/storage/fibre-channel/fc-fabric"/>
-			<pkg name="pkg:/service/storage/media-volume-manager"/>
-			<pkg name="pkg:/service/storage/removable-media"/>
-			<pkg name="pkg:/shell/bash"/>
-			<pkg name="pkg:/shell/expect"/>
-			<pkg name="pkg:/shell/tcsh"/>
-			<pkg name="pkg:/shell/which"/>
-			<pkg name="pkg:/shell/zsh"/>
-			<pkg name="pkg:/storage/library/network-array"/>
-			<pkg name="pkg:/storage/mpathadm"/>
-			<pkg name="pkg:/storage/svm"/>
-			<pkg name="pkg:/system/accounting/legacy"/>
-			<pkg name="pkg:/system/boot/grub"/>
-			<pkg name="pkg:/system/boot/wanboot"/>
-			<pkg name="pkg:/system/data/hardware-registry"/>
-			<pkg name="pkg:/system/data/keyboard/keytables"/>
-			<pkg name="pkg:/system/data/terminfo"/>
-			<pkg name="pkg:/system/domain-configuration/sparc-enterprise"/>
-			<pkg name="pkg:/system/domain-service-processor-protocol/sparc-enterprise"/>
-			<pkg name="pkg:/system/embedded-fcode-interpreter"/>
-			<pkg name="pkg:/system/extended-system-utilities"/>
-			<pkg name="pkg:/system/file-system/autofs"/>
-			<pkg name="pkg:/system/file-system/nfs"/>
-			<pkg name="pkg:/system/file-system/smb"/>
-			<pkg name="pkg:/system/file-system/udfs"/>
-			<pkg name="pkg:/system/file-system/zfs"/>
-			<pkg name="pkg:/system/flash/fwflash"/>
-			<pkg name="pkg:/system/floating-point-scrubber"/>
-			<pkg name="pkg:/system/fru-id"/>
-			<pkg name="pkg:/system/fru-id/platform"/>
-			<pkg name="pkg:/system/graphics/fbconfig"/>
-			<pkg name="pkg:/system/graphics/fbconfig/fbconfig-ast"/>
-			<pkg name="pkg:/system/graphics/fbconfig/fbconfig-efb"/>
-			<pkg name="pkg:/system/graphics/fbconfig/fbconfig-kfb"/>
-			<pkg name="pkg:/system/install"/>
-			<pkg name="pkg:/system/install/auto-install"/>
-			<pkg name="pkg:/system/install/auto-install/auto-install-common"/>
-			<pkg name="pkg:/system/install/locale"/>
+			<pkg name="pkg:/server_install"/>
+			<pkg name="pkg:/system/install/text-install"/>
 			<pkg name="pkg:/system/install/media/internal"/>
-			<pkg name="pkg:/system/install/tests"/>
-			<pkg name="pkg:/system/install/text-install"/>
-			<pkg name="pkg:/system/ipc"/>
-			<pkg name="pkg:/system/ipmi/ipmitool"/>
-			<pkg name="pkg:/system/kernel"/>
-			<pkg name="pkg:/system/kernel/cpu-counters"/>
-			<pkg name="pkg:/system/kernel/cpu/sun4v"/>
-			<pkg name="pkg:/system/kernel/dtrace/providers"/>
-			<pkg name="pkg:/system/kernel/dynamic-reconfiguration/sun-fire-15000"/>
-			<pkg name="pkg:/system/kernel/dynamic-reconfiguration/sun-fire-880"/>
-			<pkg name="pkg:/system/kernel/dynamic-reconfiguration/ultra-enterprise-10000"/>
-			<pkg name="pkg:/system/kernel/inter-domain/ultra-enterprise-10000"/>
-			<pkg name="pkg:/system/kernel/io-performance-counters"/>
-			<pkg name="pkg:/system/kernel/platform"/>
-			<pkg name="pkg:/system/kernel/platform/netra"/>
-			<pkg name="pkg:/system/kernel/power"/>
-			<pkg name="pkg:/system/kernel/suspend-resume"/>
-			<pkg name="pkg:/system/kernel/ultra-wideband"/>
-			<pkg name="pkg:/system/ldoms"/>
-			<pkg name="pkg:/system/library"/>
-			<pkg name="pkg:/system/library/c++/sunpro"/>
-			<pkg name="pkg:/system/library/dbus"/>
-			<pkg name="pkg:/system/library/iconv/utf-8"/>
-			<pkg name="pkg:/system/library/iconv/xsh4/eastern-european"/>
-			<pkg name="pkg:/system/library/install"/>
-			<pkg name="pkg:/system/library/libdiskmgt"/>
-			<pkg name="pkg:/system/library/libfcoe"/>
-			<pkg name="pkg:/system/library/libpcap"/>
-			<pkg name="pkg:/system/library/math"/>
-			<pkg name="pkg:/system/library/math/header-math"/>
-			<pkg name="pkg:/system/library/mozilla-nss"/>
-			<pkg name="pkg:/system/library/platform"/>
-			<pkg name="pkg:/system/library/processor"/>
-			<pkg name="pkg:/system/library/security/libgcrypt"/>
-			<pkg name="pkg:/system/library/security/libsasl"/>
-			<pkg name="pkg:/system/library/storage/fibre-channel/hbaapi"/>
-			<pkg name="pkg:/system/library/storage/fibre-channel/libsun_fc"/>
-			<pkg name="pkg:/system/library/storage/ima"/>
-			<pkg name="pkg:/system/library/storage/ima/header-ima"/>
-			<pkg name="pkg:/system/library/storage/libmpapi"/>
-			<pkg name="pkg:/system/library/storage/libmpscsi_vhci"/>
-			<pkg name="pkg:/system/library/sysidtool"/>
-			<pkg name="pkg:/system/library/usb/libusb"/>
-			<pkg name="pkg:/system/library/usb/libusbugen"/>
-			<pkg name="pkg:/system/locale"/>
-			<pkg name="pkg:/system/locale/ar"/>
-			<pkg name="pkg:/system/locale/be"/>
-			<pkg name="pkg:/system/locale/bg"/>
-			<pkg name="pkg:/system/locale/ca"/>
-			<pkg name="pkg:/system/locale/cs"/>
-			<pkg name="pkg:/system/locale/da"/>
-			<pkg name="pkg:/system/locale/de_de"/>
-			<pkg name="pkg:/system/locale/de"/>
-			<pkg name="pkg:/system/locale/el"/>
-			<pkg name="pkg:/system/locale/en_us"/>
-			<pkg name="pkg:/system/locale/en"/>
-			<pkg name="pkg:/system/locale/es_es"/>
-			<pkg name="pkg:/system/locale/es"/>
-			<pkg name="pkg:/system/locale/et_ee"/>
-			<pkg name="pkg:/system/locale/fi"/>
-			<pkg name="pkg:/system/locale/fr_fr"/>
-			<pkg name="pkg:/system/locale/fr"/>
-			<pkg name="pkg:/system/locale/he"/>
-			<pkg name="pkg:/system/locale/hi"/>
-			<pkg name="pkg:/system/locale/hr"/>
-			<pkg name="pkg:/system/locale/hu"/>
-			<pkg name="pkg:/system/locale/id"/>
-			<pkg name="pkg:/system/locale/is"/>
-			<pkg name="pkg:/system/locale/it"/>
-			<pkg name="pkg:/system/locale/ja"/>
-			<pkg name="pkg:/system/locale/ka"/>
-			<pkg name="pkg:/system/locale/kk"/>
-			<pkg name="pkg:/system/locale/ko"/>
-			<pkg name="pkg:/system/locale/lt"/>
-			<pkg name="pkg:/system/locale/lv"/>
-			<pkg name="pkg:/system/locale/mk"/>
-			<pkg name="pkg:/system/locale/ms"/>
-			<pkg name="pkg:/system/locale/mt"/>
-			<pkg name="pkg:/system/locale/nb"/>
-			<pkg name="pkg:/system/locale/nl"/>
-			<pkg name="pkg:/system/locale/nn"/>
-			<pkg name="pkg:/system/locale/pl"/>
-			<pkg name="pkg:/system/locale/pt_br"/>
-			<pkg name="pkg:/system/locale/pt"/>
-			<pkg name="pkg:/system/locale/ro"/>
-			<pkg name="pkg:/system/locale/ru"/>
-			<pkg name="pkg:/system/locale/sh"/>
-			<pkg name="pkg:/system/locale/sk"/>
-			<pkg name="pkg:/system/locale/sl"/>
-			<pkg name="pkg:/system/locale/sq"/>
-			<pkg name="pkg:/system/locale/sr"/>
-			<pkg name="pkg:/system/locale/sv"/>
-			<pkg name="pkg:/system/locale/th"/>
-			<pkg name="pkg:/system/locale/tr"/>
-			<pkg name="pkg:/system/locale/uk"/>
-			<pkg name="pkg:/system/locale/vi"/>
-			<pkg name="pkg:/system/locale/zh_cn"/>
-			<pkg name="pkg:/system/locale/zh_hk"/>
-			<pkg name="pkg:/system/locale/zh_tw"/>
-			<pkg name="pkg:/system/management/product-registry"/>
-			<pkg name="pkg:/system/management/snmp/net-snmp"/>
-			<pkg name="pkg:/system/management/sysidtool"/>
-			<pkg name="pkg:/system/manual"/>
-			<pkg name="pkg:/system/manual/locale/ja"/>
-			<pkg name="pkg:/system/network-console"/>
-			<pkg name="pkg:/system/network"/>
-			<pkg name="pkg:/system/network/nis"/>
-			<pkg name="pkg:/system/network/ppp"/>
-			<pkg name="pkg:/system/network/ppp/pppdump"/>
-			<pkg name="pkg:/system/network/ppp/tunnel"/>
-			<pkg name="pkg:/system/network/routing"/>
-			<pkg name="pkg:/system/network/spdadm"/>
-			<pkg name="pkg:/system/network/udapl"/>
-			<pkg name="pkg:/system/network/udapl/udapl-tavor"/>
-			<pkg name="pkg:/system/prerequisite/gnu"/>
-			<pkg name="pkg:/system/scheduler/fss"/>
-			<pkg name="pkg:/system/storage/fibre-channel/port-utility"/>
-			<pkg name="pkg:/system/storage/luxadm"/>
-			<pkg name="pkg:/system/trusted"/>
-			<pkg name="pkg:/system/xopen/xcu4"/>
-			<pkg name="pkg:/system/zones"/>
-			<pkg name="pkg:/system/zones/brand/ipkg"/>
-			<pkg name="pkg:/text/doctools"/>
-			<pkg name="pkg:/text/gawk"/>
-			<pkg name="pkg:/text/gnu-diffutils"/>
-			<pkg name="pkg:/text/gnu-grep"/>
-			<pkg name="pkg:/text/gnu-patch"/>
-			<pkg name="pkg:/text/gnu-sed"/>
-			<pkg name="pkg:/text/less"/>
-			<pkg name="pkg:/text/locale"/>
-			<pkg name="pkg:/text/texinfo"/>
-			<pkg name="pkg:/web/curl"/>
-			<pkg name="pkg:/web/wget"/>
-			<pkg name="pkg:/x11/server/xorg/driver/xorg-efb"/>
-			<pkg name="pkg:/x11/server/xorg/driver/xorg-kfb"/>
 		</packages>
 <!--
      Items below this line are rarely configured
 -->
 		<!--
+		    server_install is a group package used to define the
+		    default installation. It is removed here so that it does
+		    not inhibit removal of other packages on the
+		    installed system.
+		--> 
+		<post_install_remove_packages>
+			<pkg name="pkg:/server_install"/>
+		</post_install_remove_packages>
+		<!--
 		     If/how to compress the live image.
 		     type = compression algorithm to use for pkg.zlib and misc.zlib.
 		     Valid types are lzma, gzip, and none.
--- a/usr/src/cmd/distro_const/text_install/text_mode_x86.xml	Fri Oct 01 10:52:22 2010 -0400
+++ b/usr/src/cmd/distro_const/text_install/text_mode_x86.xml	Sun Oct 03 07:45:56 2010 -0700
@@ -266,375 +266,23 @@
 			    <pkg name="pkg:/[email protected]#/>
 			-->
 			<pkg name="pkg:/entire"/>
-			<pkg name="pkg:/SUNWcs"/>
-			<pkg name="pkg:/SUNWcsd"/>
-			<pkg name="pkg:/archiver/gnu-tar"/>
-			<pkg name="pkg:/compress/bzip2"/>
-			<pkg name="pkg:/compress/gzip"/>
-			<pkg name="pkg:/compress/p7zip"/>
-			<pkg name="pkg:/compress/unzip"/>
-			<pkg name="pkg:/compress/zip"/>
-			<pkg name="pkg:/data/iso-codes"/>
-			<pkg name="pkg:/database/sqlite-3"/>
-			<pkg name="pkg:/developer/build/make"/>
-			<pkg name="pkg:/developer/debug/mdb"/>
-			<pkg name="pkg:/developer/debug/mdb/module/module-fibre-channel"/>
-			<pkg name="pkg:/developer/debug/mdb/module/module-qlc"/>
-			<pkg name="pkg:/developer/dtrace"/>
-			<pkg name="pkg:/developer/dtrace/toolkit"/>
-			<pkg name="pkg:/developer/linker"/>
-			<pkg name="pkg:/developer/macro/cpp"/>
-			<pkg name="pkg:/developer/object-file"/>
-			<pkg name="pkg:/diagnostic/cpu-counters"/>
-			<pkg name="pkg:/diagnostic/ddu/text"/>
-			<pkg name="pkg:/diagnostic/powertop"/>
-			<pkg name="pkg:/diagnostic/scanpci"/>
-			<pkg name="pkg:/diagnostic/top"/>
-			<pkg name="pkg:/driver/audio/audio810"/>
-			<pkg name="pkg:/driver/audio/audiovia823x"/>
-			<pkg name="pkg:/driver/crypto/tpm"/>
-			<pkg name="pkg:/driver/firewire"/>
-			<pkg name="pkg:/driver/graphics/agpgart"/>
-			<pkg name="pkg:/driver/graphics/dcam1394"/>
-			<pkg name="pkg:/driver/graphics/dcam1394/devfsadm-dcam1394"/>
-			<pkg name="pkg:/driver/graphics/drm"/>
-			<pkg name="pkg:/driver/i86pc/fipe"/>
-			<pkg name="pkg:/driver/i86pc/ioat"/>
-			<pkg name="pkg:/driver/i86pc/platform"/>
-			<pkg name="pkg:/driver/network/afe"/>
-			<pkg name="pkg:/driver/network/amd8111s"/>
-			<pkg name="pkg:/driver/network/atge"/>
-			<pkg name="pkg:/driver/network/bfe"/>
-			<pkg name="pkg:/driver/network/bge"/>
-			<pkg name="pkg:/driver/network/bnxe"/>
-			<pkg name="pkg:/driver/network/bpf"/>
-			<pkg name="pkg:/driver/network/ce"/>
-			<pkg name="pkg:/driver/network/chxge"/>
-			<pkg name="pkg:/driver/network/dmfe"/>
-			<pkg name="pkg:/driver/network/e1000g"/>
-			<pkg name="pkg:/driver/network/emlxs"/>
-			<pkg name="pkg:/driver/network/fcip"/>
-			<pkg name="pkg:/driver/network/fcp"/>
-			<pkg name="pkg:/driver/network/fcsm"/>
-			<pkg name="pkg:/driver/network/fp"/>
-			<pkg name="pkg:/driver/network/hme"/>
-			<pkg name="pkg:/driver/network/hxge"/>
-			<pkg name="pkg:/driver/network/ib"/>
-			<pkg name="pkg:/driver/network/ibd"/>
-			<pkg name="pkg:/driver/network/igb"/>
-			<pkg name="pkg:/driver/network/ixgb"/>
-			<pkg name="pkg:/driver/network/ixgbe"/>
-			<pkg name="pkg:/driver/network/mxfe"/>
-			<pkg name="pkg:/driver/network/myri10ge"/>
-			<pkg name="pkg:/driver/network/nge"/>
-			<pkg name="pkg:/driver/network/ntxn"/>
-			<pkg name="pkg:/driver/network/nxge"/>
-			<pkg name="pkg:/driver/network/platform"/>
-			<pkg name="pkg:/driver/network/qlc"/>
-			<pkg name="pkg:/driver/network/rge"/>
-			<pkg name="pkg:/driver/network/rpcib"/>
-			<pkg name="pkg:/driver/network/rtls"/>
-			<pkg name="pkg:/driver/network/sdp"/>
-			<pkg name="pkg:/driver/network/sdpib"/>
-			<pkg name="pkg:/driver/network/sfe"/>
-			<pkg name="pkg:/driver/network/tavor"/>
-			<pkg name="pkg:/driver/network/vr"/>
-			<pkg name="pkg:/driver/network/xge"/>
-			<pkg name="pkg:/driver/network/yge"/>
-			<pkg name="pkg:/driver/pcmcia"/>
-			<pkg name="pkg:/driver/serial/pcser"/>
-			<pkg name="pkg:/driver/serial/usbftdi"/>
-			<pkg name="pkg:/driver/serial/usbsacm"/>
-			<pkg name="pkg:/driver/serial/usbser_edge"/>
-			<pkg name="pkg:/driver/serial/usbser"/>
-			<pkg name="pkg:/driver/serial/usbsksp"/>
-			<pkg name="pkg:/driver/serial/usbsksp/usbs49_fw"/>
-			<pkg name="pkg:/driver/serial/usbsprl"/>
-			<pkg name="pkg:/driver/storage/aac"/>
-			<pkg name="pkg:/driver/storage/adpu320"/>
-			<pkg name="pkg:/driver/storage/ahci"/>
-			<pkg name="pkg:/driver/storage/amr"/>
-			<pkg name="pkg:/driver/storage/arcmsr"/>
-			<pkg name="pkg:/driver/storage/ata"/>
-			<pkg name="pkg:/driver/storage/bcm_sata"/>
-			<pkg name="pkg:/driver/storage/cpqary3"/>
-			<pkg name="pkg:/driver/storage/glm"/>
-			<pkg name="pkg:/driver/storage/lsimega"/>
-			<pkg name="pkg:/driver/storage/marvell88sx"/>
-			<pkg name="pkg:/driver/storage/mega_sas"/>
-			<pkg name="pkg:/driver/storage/mpt_sas"/>
-			<pkg name="pkg:/driver/storage/mr_sas"/>
-			<pkg name="pkg:/driver/storage/nv_sata"/>
-			<pkg name="pkg:/driver/storage/pcata"/>
-			<pkg name="pkg:/driver/storage/pmcs"/>
-			<pkg name="pkg:/driver/storage/sbp2"/>
-			<pkg name="pkg:/driver/storage/scsa1394"/>
-			<pkg name="pkg:/driver/storage/sdcard"/>
-			<pkg name="pkg:/driver/storage/ses"/>
-			<pkg name="pkg:/driver/storage/si3124"/>
-			<pkg name="pkg:/driver/storage/smp"/>
-			<pkg name="pkg:/driver/usb"/>
-			<pkg name="pkg:/driver/usb/ugen"/>
-			<pkg name="pkg:/driver/xvm/pv"/>
-			<pkg name="pkg:/editor/nano"/>
-			<pkg name="pkg:/editor/vim"/>
-			<pkg name="pkg:/file/gnu-coreutils"/>
-			<pkg name="pkg:/file/gnu-findutils"/>
-			<pkg name="pkg:/image/library/libtiff"/>
-			<pkg name="pkg:/install/beadm"/>
-			<pkg name="pkg:/install/installadm"/>
-			<pkg name="pkg:/library/aalib"/>
-			<pkg name="pkg:/library/c++/sigcpp"/>
-			<pkg name="pkg:/library/expat"/>
-			<pkg name="pkg:/library/gmp"/>
-			<pkg name="pkg:/library/gnutls"/>
-			<pkg name="pkg:/library/idnkit"/>
-			<pkg name="pkg:/library/libdaemon"/>
-			<pkg name="pkg:/library/libffi"/>
-			<pkg name="pkg:/library/libidn"/>
-			<pkg name="pkg:/library/libtasn1"/>
-			<pkg name="pkg:/library/libtecla"/>
-			<pkg name="pkg:/library/libtool/libltdl"/>
-			<pkg name="pkg:/library/libxml2"/>
-			<pkg name="pkg:/library/libxslt"/>
-			<pkg name="pkg:/library/ncurses"/>
-			<pkg name="pkg:/library/nspr"/>
-			<pkg name="pkg:/library/pcre"/>
-			<pkg name="pkg:/library/perl-5/authen-pam"/>
-			<pkg name="pkg:/library/perl-5/xml-parser"/>
-			<pkg name="pkg:/library/popt"/>
-			<pkg name="pkg:/library/print/cups-libs"/>
-			<pkg name="pkg:/library/print/open-printing"/>
-			<pkg name="pkg:/library/print/open-printing/ipp"/>
-			<pkg name="pkg:/library/print/open-printing/lpd"/>
-			<pkg name="pkg:/library/python-2/cherrypy"/>
-			<pkg name="pkg:/library/python-2/lxml-24"/>
-			<pkg name="pkg:/library/python-2/mako"/>
-			<pkg name="pkg:/library/python-2/ply"/>
-			<pkg name="pkg:/library/python-2/pycurl"/>
-			<pkg name="pkg:/library/python-2/pyopenssl-24"/>
-			<pkg name="pkg:/library/python-2/python-twisted-24"/>
-			<pkg name="pkg:/library/python-2/python-xdg-24"/>
-			<pkg name="pkg:/library/python-2/python-zope-interface-24"/>
-			<pkg name="pkg:/library/python-2/pyyaml-24"/>
-			<pkg name="pkg:/library/samba/libsmbclient"/>
-			<pkg name="pkg:/library/security/libgpg-error"/>
-			<pkg name="pkg:/library/security/openssl"/>
-			<pkg name="pkg:/library/security/tcp-wrapper"/>
-			<pkg name="pkg:/library/security/trousers"/>
-			<pkg name="pkg:/library/zlib"/>
-			<pkg name="pkg:/media/cdrtools"/>
-			<pkg name="pkg:/naming/ldap"/>
-			<pkg name="pkg:/network/bridging"/>
-			<pkg name="pkg:/network/dns/bind"/>
-			<pkg name="pkg:/network/ftp"/>
-			<pkg name="pkg:/network/ipfilter"/>
-			<pkg name="pkg:/network/iscsi/initiator"/>
-			<pkg name="pkg:/network/rsync"/>
-			<pkg name="pkg:/network/ssh"/>
-			<pkg name="pkg:/network/ssh/ssh-key"/>
-			<pkg name="pkg:/network/telnet"/>
-			<pkg name="pkg:/package/pkg"/>
-			<pkg name="pkg:/package/svr4"/>
-			<pkg name="pkg:/print/cups"/>
-			<pkg name="pkg:/print/lp"/>
-			<pkg name="pkg:/print/lp/filter/a2ps"/>
-			<pkg name="pkg:/print/lp/filter/foomatic-ppds"/>
-			<pkg name="pkg:/print/lp/filter/foomatic-rip"/>
-			<pkg name="pkg:/print/lp/filter/postscript-lp-filter"/>
-			<pkg name="pkg:/print/lp/ipp/ipp-listener"/>
-			<pkg name="pkg:/print/lp/ipp/libipp"/>
-			<pkg name="pkg:/release/copyright"/>
-			<pkg name="pkg:/release/name"/>
-			<pkg name="pkg:/runtime/perl-584"/>
-			<pkg name="pkg:/runtime/perl-584/extra"/>
-			<pkg name="pkg:/runtime/perl-584/manual"/>
-			<pkg name="pkg:/runtime/tcl-8"/>
-			<pkg name="pkg:/runtime/tk-8"/>
-			<pkg name="pkg:/security/bart"/>
-			<pkg name="pkg:/security/sudo"/>
-			<pkg name="pkg:/service/fault-management"/>
-			<pkg name="pkg:/service/file-system/nfs"/>
-			<pkg name="pkg:/service/hal"/>
-			<pkg name="pkg:/service/management/sysidtool"/>
-			<pkg name="pkg:/service/network/dns/bind"/>
-			<pkg name="pkg:/service/network/dns/mdns"/>
-			<pkg name="pkg:/service/network/ftp"/>
-			<pkg name="pkg:/service/network/network-clients"/>
-			<pkg name="pkg:/service/network/network-servers"/>
-			<pkg name="pkg:/service/network/ntp"/>
-			<pkg name="pkg:/service/network/smtp/sendmail"/>
-			<pkg name="pkg:/service/network/ssh"/>
-			<pkg name="pkg:/service/network/telnet"/>
-			<pkg name="pkg:/service/network/tftp"/>
-			<pkg name="pkg:/service/picl"/>
-			<pkg name="pkg:/service/resource-pools"/>
-			<pkg name="pkg:/service/resource-pools/poold"/>
-			<pkg name="pkg:/service/storage/fibre-channel/fc-fabric"/>
-			<pkg name="pkg:/service/storage/media-volume-manager"/>
-			<pkg name="pkg:/service/storage/removable-media"/>
-			<pkg name="pkg:/shell/bash"/>
-			<pkg name="pkg:/shell/expect"/>
-			<pkg name="pkg:/shell/tcsh"/>
-			<pkg name="pkg:/shell/which"/>
-			<pkg name="pkg:/shell/zsh"/>
-			<pkg name="pkg:/storage/mpathadm"/>
-			<pkg name="pkg:/storage/svm"/>
-			<pkg name="pkg:/system/accounting/legacy"/>
-			<pkg name="pkg:/system/boot/grub"/>
-			<pkg name="pkg:/system/boot/real-mode"/>
-			<pkg name="pkg:/system/boot/wanboot"/>
-			<pkg name="pkg:/system/data/hardware-registry"/>
-			<pkg name="pkg:/system/data/keyboard/keytables"/>
-			<pkg name="pkg:/system/data/terminfo"/>
-			<pkg name="pkg:/system/extended-system-utilities"/>
-			<pkg name="pkg:/system/file-system/autofs"/>
-			<pkg name="pkg:/system/file-system/nfs"/>
-			<pkg name="pkg:/system/file-system/smb"/>
-			<pkg name="pkg:/system/file-system/udfs"/>
-			<pkg name="pkg:/system/file-system/zfs"/>
-			<pkg name="pkg:/system/flash/fwflash"/>
-			<pkg name="pkg:/system/fru-id"/>
-			<pkg name="pkg:/system/fru-id/platform"/>
-			<pkg name="pkg:/system/install"/>
-			<pkg name="pkg:/system/install/auto-install"/>
-			<pkg name="pkg:/system/install/auto-install/auto-install-common"/>
-			<pkg name="pkg:/system/install/locale"/>
+			<pkg name="pkg:/server_install"/>
+			<pkg name="pkg:/system/install/text-install"/>
 			<pkg name="pkg:/system/install/media/internal"/>
-			<pkg name="pkg:/system/install/tests"/>
-			<pkg name="pkg:/system/install/text-install"/>
-			<pkg name="pkg:/system/ipc"/>
-			<pkg name="pkg:/system/ipmi/ipmitool"/>
-			<pkg name="pkg:/system/kernel"/>
-			<pkg name="pkg:/system/kernel/cpu-counters"/>
-			<pkg name="pkg:/system/kernel/dtrace/providers"/>
-			<pkg name="pkg:/system/kernel/platform"/>
-			<pkg name="pkg:/system/kernel/power"/>
-			<pkg name="pkg:/system/kernel/suspend-resume"/>
-			<pkg name="pkg:/system/kernel/ultra-wideband"/>
-			<pkg name="pkg:/system/library"/>
-			<pkg name="pkg:/system/library/c++/sunpro"/>
-			<pkg name="pkg:/system/library/dbus"/>
-			<pkg name="pkg:/system/library/iconv/utf-8"/>
-			<pkg name="pkg:/system/library/iconv/xsh4/eastern-european"/>
-			<pkg name="pkg:/system/library/install"/>
-			<pkg name="pkg:/system/library/libdiskmgt"/>
-			<pkg name="pkg:/system/library/libfcoe"/>
-			<pkg name="pkg:/system/library/libpcap"/>
-			<pkg name="pkg:/system/library/libvirt"/>
-			<pkg name="pkg:/system/library/math"/>
-			<pkg name="pkg:/system/library/math/header-math"/>
-			<pkg name="pkg:/system/library/mozilla-nss"/>
-			<pkg name="pkg:/system/library/platform"/>
-			<pkg name="pkg:/system/library/processor"/>
-			<pkg name="pkg:/system/library/security/libgcrypt"/>
-			<pkg name="pkg:/system/library/security/libsasl"/>
-			<pkg name="pkg:/system/library/storage/fibre-channel/hbaapi"/>
-			<pkg name="pkg:/system/library/storage/fibre-channel/libsun_fc"/>
-			<pkg name="pkg:/system/library/storage/ima"/>
-			<pkg name="pkg:/system/library/storage/ima/header-ima"/>
-			<pkg name="pkg:/system/library/storage/libmpapi"/>
-			<pkg name="pkg:/system/library/storage/libmpscsi_vhci"/>
-			<pkg name="pkg:/system/library/sysidtool"/>
-			<pkg name="pkg:/system/library/usb/libusb"/>
-			<pkg name="pkg:/system/library/usb/libusbugen"/>
-			<pkg name="pkg:/system/locale"/>
-			<pkg name="pkg:/system/locale/ar"/>
-			<pkg name="pkg:/system/locale/be"/>
-			<pkg name="pkg:/system/locale/bg"/>
-			<pkg name="pkg:/system/locale/ca"/>
-			<pkg name="pkg:/system/locale/cs"/>
-			<pkg name="pkg:/system/locale/da"/>
-			<pkg name="pkg:/system/locale/de_de"/>
-			<pkg name="pkg:/system/locale/de"/>
-			<pkg name="pkg:/system/locale/el"/>
-			<pkg name="pkg:/system/locale/en_us"/>
-			<pkg name="pkg:/system/locale/en"/>
-			<pkg name="pkg:/system/locale/es_es"/>
-			<pkg name="pkg:/system/locale/es"/>
-			<pkg name="pkg:/system/locale/et_ee"/>
-			<pkg name="pkg:/system/locale/fi"/>
-			<pkg name="pkg:/system/locale/fr_fr"/>
-			<pkg name="pkg:/system/locale/fr"/>
-			<pkg name="pkg:/system/locale/he"/>
-			<pkg name="pkg:/system/locale/hi"/>
-			<pkg name="pkg:/system/locale/hr"/>
-			<pkg name="pkg:/system/locale/hu"/>
-			<pkg name="pkg:/system/locale/id"/>
-			<pkg name="pkg:/system/locale/is"/>
-			<pkg name="pkg:/system/locale/it"/>
-			<pkg name="pkg:/system/locale/ja"/>
-			<pkg name="pkg:/system/locale/ka"/>
-			<pkg name="pkg:/system/locale/kk"/>
-			<pkg name="pkg:/system/locale/ko"/>
-			<pkg name="pkg:/system/locale/lt"/>
-			<pkg name="pkg:/system/locale/lv"/>
-			<pkg name="pkg:/system/locale/mk"/>
-			<pkg name="pkg:/system/locale/ms"/>
-			<pkg name="pkg:/system/locale/mt"/>
-			<pkg name="pkg:/system/locale/nb"/>
-			<pkg name="pkg:/system/locale/nl"/>
-			<pkg name="pkg:/system/locale/nn"/>
-			<pkg name="pkg:/system/locale/pl"/>
-			<pkg name="pkg:/system/locale/pt_br"/>
-			<pkg name="pkg:/system/locale/pt"/>
-			<pkg name="pkg:/system/locale/ro"/>
-			<pkg name="pkg:/system/locale/ru"/>
-			<pkg name="pkg:/system/locale/sh"/>
-			<pkg name="pkg:/system/locale/sk"/>
-			<pkg name="pkg:/system/locale/sl"/>
-			<pkg name="pkg:/system/locale/sq"/>
-			<pkg name="pkg:/system/locale/sr"/>
-			<pkg name="pkg:/system/locale/sv"/>
-			<pkg name="pkg:/system/locale/th"/>
-			<pkg name="pkg:/system/locale/tr"/>
-			<pkg name="pkg:/system/locale/uk"/>
-			<pkg name="pkg:/system/locale/vi"/>
-			<pkg name="pkg:/system/locale/zh_cn"/>
-			<pkg name="pkg:/system/locale/zh_hk"/>
-			<pkg name="pkg:/system/locale/zh_tw"/>
-			<pkg name="pkg:/system/management/intel-amt"/>
-			<pkg name="pkg:/system/management/product-registry"/>
-			<pkg name="pkg:/system/management/snmp/net-snmp"/>
-			<pkg name="pkg:/system/management/sysidtool"/>
-			<pkg name="pkg:/system/manual"/>
-			<pkg name="pkg:/system/manual/locale/ja"/>
-			<pkg name="pkg:/system/network"/>
-			<pkg name="pkg:/system/network/nis"/>
-			<pkg name="pkg:/system/network/ppp"/>
-			<pkg name="pkg:/system/network/ppp/pppdump"/>
-			<pkg name="pkg:/system/network/ppp/tunnel"/>
-			<pkg name="pkg:/system/network/routing"/>
-			<pkg name="pkg:/system/network/spdadm"/>
-			<pkg name="pkg:/system/network/udapl"/>
-			<pkg name="pkg:/system/network/udapl/udapl-tavor"/>
-			<pkg name="pkg:/system/prerequisite/gnu"/>
-			<pkg name="pkg:/system/scheduler/fss"/>
-			<pkg name="pkg:/system/storage/fibre-channel/port-utility"/>
-			<pkg name="pkg:/system/storage/luxadm"/>
-			<pkg name="pkg:/system/trusted"/>
-			<pkg name="pkg:/system/xopen/xcu4"/>
-			<pkg name="pkg:/system/xvm/ipagent"/>
-			<pkg name="pkg:/system/xvm/xvmstore"/>
-			<pkg name="pkg:/system/zones"/>
-			<pkg name="pkg:/system/zones/brand/ipkg"/>
-			<pkg name="pkg:/system/zones/brand/lx"/>
-			<pkg name="pkg:/text/doctools"/>
-			<pkg name="pkg:/text/gawk"/>
-			<pkg name="pkg:/text/gnu-diffutils"/>
-			<pkg name="pkg:/text/gnu-grep"/>
-			<pkg name="pkg:/text/gnu-patch"/>
-			<pkg name="pkg:/text/gnu-sed"/>
-			<pkg name="pkg:/text/less"/>
-			<pkg name="pkg:/text/locale"/>
-			<pkg name="pkg:/text/texinfo"/>
-			<pkg name="pkg:/web/curl"/>
-			<pkg name="pkg:/web/wget"/>
 		</packages>
 <!--
      Items below this line are rarely configured
 -->
 		<!--
+		    server_install is a group package used to define the
+		    default installation. It is removed here so that it does
+		    not inhibit removal of other packages on the
+		    installed system.
+		--> 
+		<post_install_remove_packages>
+			<pkg name="pkg:/server_install"/>
+		</post_install_remove_packages>
+		<!--
 		     If/how to compress the live image.
 		     type = compression algorithm to use for pkg.zlib and misc.zlib.
 		     Valid types are lzma, gzip, and none.