--- a/usr/src/cmd/auto-install/auto_install.c	Mon Feb 16 05:08:16 2009 -0700
+++ b/usr/src/cmd/auto-install/auto_install.c	Tue Feb 17 10:42:14 2009 -0700
@@ -610,7 +610,7 @@
 	    asp.timezone) != 0) {
 		nvlist_free(install_attr);
 		auto_debug_print(AUTO_DBGLVL_INFO,
-		    "Setting of OM_ATTR_TIMEZONE_INFO failed\n");
+		    "Setting of OM_ATTR_DEFAULT_LOCALE failed\n");
 		return (AUTO_INSTALL_FAILURE);
 	}
 
@@ -839,13 +839,10 @@
 		return (AUTO_INSTALL_FAILURE);
 	}
 	status = om_perform_install(install_attr, auto_update_progress);
-	if (status == OM_FAILURE) { /* synchronous failure before threading */
-		install_error = om_errno;
-		install_failed = B_TRUE;
-	}
-	/* wait for thread to report final status */
+
 	while (!install_done && !install_failed)
 		sleep(10);
+
 	free(url);
 	free(authname);
 	free(transfer_attr);

--- a/usr/src/cmd/gui-install/src/installation-screen.c	Mon Feb 16 05:08:16 2009 -0700
+++ b/usr/src/cmd/gui-install/src/installation-screen.c	Tue Feb 17 10:42:14 2009 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -892,7 +892,18 @@
 				}
 			}
 
-			/* 8 : OM_ATTR_TIMEZONE_INFO - time zone set in GUI - attribute not set for Orchestrator */
+			/* 8 : OM_ATTR_TIMEZONE_INFO */
+			if (InstallationProfile.timezone) {
+				if ((err = nvlist_add_string(
+							install_choices,
+							OM_ATTR_TIMEZONE_INFO,
+							InstallationProfile.timezone->tz_name)) != 0) {
+					g_warning(
+						_("Failed to add %s to pair list"),
+						"OM_ATTR_TIMEZONE_INFO");
+					break;
+				}
+			}
 
 			/* 9 : OM_ATTR_DEFAULT_LOCALE */
 			if (InstallationProfile.def_locale) {

--- a/usr/src/lib/liborchestrator/perform_slim_install.c	Mon Feb 16 05:08:16 2009 -0700
+++ b/usr/src/lib/liborchestrator/perform_slim_install.c	Tue Feb 17 10:42:14 2009 -0700
@@ -225,7 +225,7 @@
 {
 	char		*name;
 	char		*lname = NULL, *rpasswd = NULL, *hostname = NULL,
-	    *uname = NULL, *upasswd = NULL, *timezone = NULL;
+	    *uname = NULL, *upasswd = NULL;
 	int		status = OM_SUCCESS;
 	nvlist_t	*target_attrs = NULL, **transfer_attr;
 	uint_t		transfer_attr_num;
@@ -292,17 +292,6 @@
 
 	if (!ti_test) {
 	/*
-	 * Get the timezone
-	 */
-	if (nvlist_lookup_string(uchoices,
-	    OM_ATTR_TIMEZONE_INFO, &timezone) == 0) {
-		if (om_set_time_zone(timezone) == OM_FAILURE)
-			return (OM_FAILURE);
-	} else
-		om_debug_print(OM_DBGLVL_WARN,
-		    "Timezone not specified among Orchestrator attributes "
-		    "(OM_ATTR_TIMEZONE_INFO)\n");
-	/*
 	 * Get the default locale. Save it off for later. We don't
 	 * set the system default locale until after the installation
 	 * has completed. XXX will Slim have this set from GUI?