--- a/src/brand/pkgcreatezone	Wed May 18 09:10:49 2011 -0700
+++ b/src/brand/pkgcreatezone	Wed May 18 14:11:41 2011 -0700
@@ -214,85 +214,15 @@
 	pkglist="$pkglist pkg:///entire"
 fi
 
-pkglist="$pkglist
-	pkg:///SUNWcs
-	pkg:///SUNWcsd
-	pkg:///system/network
-	pkg:///system/extended-system-utilities
-	pkg:///service/management/sysidtool
-	pkg:///system/management/sysidtool
-	pkg:///compress/bzip2
-	pkg:///compress/gzip
-	pkg:///compress/zip
-	pkg:///compress/unzip
-	pkg:///package/pkg
-        pkg:///package/pkg/system-repository
-	pkg:///install/beadm"
-
 #
-# Get some diagnostic tools, truss, dtrace, etc.
-#
-pkglist="$pkglist
-	pkg:///developer/linker
-	pkg:///developer/dtrace"
-
-#
-# Needed for 'whois', 'snoop' I think; also provides rup, rmt, rsh etc.
-#
-pkglist="$pkglist
-	pkg:///service/network/network-clients
-	pkg:///network/ping"
-
-#
-# Get at least one sensible shell, vim, ssh, ssh key utils, sshd.
-#
-pkglist="$pkglist
-	pkg:///shell/bash
-	pkg:///editor/vim/vim-core
-	pkg:///network/ssh
-	pkg:///network/ssh/ssh-key
-	pkg:///service/network/ssh"
-
+# If this is a labeled brand, install the trusted desktop package.
+# Otherwise, install the small server package
 #
-# Get some name services and DNS.
-#
-pkglist="$pkglist
-	pkg:///system/network/nis
-	pkg:///network/dns/bind
-	pkg:///naming/ldap"
-
-#
-# Get nfs client and autofs; it's a pain not to have them.
-#
-pkglist="$pkglist
-	pkg:///system/file-system/autofs
-	pkg:///system/file-system/nfs"
-
-#
-# Get routing daemons.  They're required for useful exclusive stack zones.
-#
-pkglist="$pkglist
-	pkg:///system/network/routing"
-
-#
-# Get packages for TX zones if appropriate.
-#
-(( $brand_labeled == 1 )) && pkglist="$pkglist pkg:///system/trusted/trusted-nonglobal"
-
-#
-# Get man(1) but not the man pages
-#
-pkglist="$pkglist \
-	pkg:///text/doctools"
-
-# 
-# packages needed for sysconfig in zone
-#
-pkglist="$pkglist \
-	pkg:///system/install
-	pkg:///system/install/configuration
-	pkg:///system/library/install
-	pkg:///security/sudo"
+if (( $brand_labeled == 1 )); then
+    pkglist="$pkglist pkg:///group/feature/trusted-desktop"
+else
+    pkglist="$pkglist pkg:///group/system/solaris-small-server"
+fi
 
 #
 # Add in any extra packages requested by the user.