--- a/usr/src/cmd/slim-install/finish/install-finish	Fri Sep 12 17:12:14 2008 -0700
+++ b/usr/src/cmd/slim-install/finish/install-finish	Sun Sep 14 10:33:17 2008 -0400
@@ -220,6 +220,7 @@
 
 # Add splash image reference and timeout
 echo "splashimage /boot/grub/splash.xpm.gz" >>$GRUBMENU
+echo "background 215ECA" >>$GRUBMENU
 echo "timeout 30" >>$GRUBMENU
 
 # Now, turn on splashimage if osconsole is "text" or "screen"
@@ -305,10 +306,10 @@
 # Point SMF at correct system profile
 rm -f ${BASEDIR}/var/svc/profile/generic.xml \
     ${BASEDIR}/var/svc/profile/name_service.xml \
-    ${BASEDIR}/var/svc/profile/inetd_generic.xml
+    ${BASEDIR}/var/svc/profile/inetd_services.xml
 ln -s generic_limited_net.xml ${BASEDIR}/var/svc/profile/generic.xml
 ln -s ns_dns.xml ${BASEDIR}/var/svc/profile/name_service.xml
-ln -s inetd_generic.xml ${BASEDIR}/var/svc/profile/inetd_generic.xml
+ln -s inetd_generic.xml ${BASEDIR}/var/svc/profile/inetd_services.xml
 
 # Add entries for sysidtool and sys-unconfig to run all known external apps.
 cat > ${BASEDIR}/etc/.sysidconfig.apps << EOF
@@ -328,6 +329,10 @@
 
 /usr/sbin/svccfg apply ${BASEDIR}/var/svc/profile/network_nwam.xml
 
+# Copy saved configuration files to remove vestiges of live CD environment
+(cd ${BASEDIR}/save; find . -type f -print | cpio -pmu ${BASEDIR})
+rm -rf ${BASEDIR}/save
+
 # Remove install-specific packages
 pkg -R ${BASEDIR} uninstall SUNWslim-utils
 

--- a/usr/src/lib/liborchestrator/perform_slim_install.c	Fri Sep 12 17:12:14 2008 -0700
+++ b/usr/src/lib/liborchestrator/perform_slim_install.c	Sun Sep 14 10:33:17 2008 -0400
@@ -2205,31 +2205,22 @@
 }
 
 /*
- * Execute install-finish script to setup the system to boot the installed
- * Solaris
+ * Execute install-finish script to complete setup.  Log in /tmp/finish_log
  */
 static void
 run_install_finish_script(char *target)
 {
-	char cmd[MAXPATHLEN];
-	char	*tool = "/sbin/install-finish";
+	char cmd[1024];
+	char *tool = 
+	    "/sbin/install-finish %s initial_install >/tmp/finish_log 2>&1";
 
 	if (target == NULL) {
 		return;
 	}
 	om_log_print("Running install-finish script\n");
-	if (access(tool, F_OK) == 0) {
-		(void) snprintf(cmd, sizeof (cmd),
-		    "%s %s initial_install",
-		    tool, target);
-	} else {
-		(void) snprintf(cmd, sizeof (cmd),
-		    "/root/installer/install-finish %s initial_install",
-		    target);
-	}
-
+	(void) snprintf(cmd, sizeof (cmd), tool, target);
 	om_log_print("%s\n", cmd);
-	td_safe_system(cmd, B_TRUE);
+	td_safe_system(cmd, B_FALSE);
 }
 
 /*
@@ -2262,8 +2253,6 @@
 transfer_config_files(char *target)
 {
 	char cmd[MAXPATHLEN];
-	char *passwd = "/etc/passwd";
-	char *shadow = "/etc/shadow";
 	char *user_attr = "/etc/user_attr";
 	char *hosts = "/etc/inet/hosts";
 
@@ -2271,20 +2260,6 @@
 		return;
 	}
 
-	(void) snprintf(cmd, sizeof (cmd),
-	    "/bin/sed -e '/^jack/d' %s >%s%s",
-	    passwd, target, passwd);
-
-	om_log_print("%s\n", cmd);
-	td_safe_system(cmd, B_FALSE);
-
-	(void) snprintf(cmd, sizeof (cmd),
-	    "/bin/sed -e '/^jack/d' %s >%s%s",
-	    shadow, target, shadow);
-
-	om_log_print("%s\n", cmd);
-	td_safe_system(cmd, B_FALSE);
-
 	if (save_login_name != NULL) {
 		/* Make user a primary administrator */
 		(void) snprintf(cmd, sizeof (cmd),

--- a/usr/src/pkgdefs/SUNWinstall/prototype_com	Fri Sep 12 17:12:14 2008 -0700
+++ b/usr/src/pkgdefs/SUNWinstall/prototype_com	Sun Sep 14 10:33:17 2008 -0400
@@ -84,6 +84,7 @@
 f none usr/bin/keyboard-layout
 
 !default 0555 root bin
+f none sbin/install-finish
 f none sbin/beadm
 s none usr/sbin/beadm=../../sbin/beadm
 f none usr/bin/ManifestRead

--- a/usr/src/pkgdefs/SUNWslim-utils/prototype_com	Fri Sep 12 17:12:14 2008 -0700
+++ b/usr/src/pkgdefs/SUNWslim-utils/prototype_com	Sun Sep 14 10:33:17 2008 -0400
@@ -40,7 +40,6 @@
 f none usr/sbin/set_lang.bash 555 root bin
 f none usr/sbin/show-license 555 root bin
 d none sbin 755 root sys
-f none sbin/install-finish 755 root bin
 f none sbin/listusb 555 root bin
 f none sbin/listcd 555 root bin
 d none jack 755 jack staff