--- a/src/brand/image_install	Fri Feb 11 14:04:06 2011 -0800
+++ b/src/brand/image_install	Wed Jun 01 13:04:31 2011 +0100
@@ -19,9 +19,8 @@
 #
 # CDDL HEADER END
 #
-
-#
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 
 #
@@ -98,8 +97,14 @@
 # If we weren't passed at least two arguments, exit now.
 (( $# < 2 )) && exit $ZONE_SUBPROC_USAGE
 
-init_zone zone "$1" "$2"
-eval $(bind_legacy_zone_globals zone)
+ZONENAME="$1"
+ZONEPATH="$2"
+# XXX shared/common script currently uses lower case zonename & zonepath
+zonename="$ZONENAME"
+zonepath="$ZONEPATH"
+
+ZONEROOT="$ZONEPATH/root"
+
 shift; shift	# remove zonename and zonepath from arguments array
 
 unset inst_type
@@ -199,7 +204,8 @@
 
 if (( $p2v_result != 0 )); then
 	log "$p2v_fail"
-	log "\n$install_fail"
+	log ""
+	log "$install_fail"
 	log "$install_log" "$LOGFILE"
 	exit $ZONE_SUBPROC_FATAL
 fi
@@ -218,9 +224,10 @@
 
 # Mount active dataset on the root.
 is_brand_labeled
-(( $? == 0 )) && mount_active_be -c zone
+(( $? == 0 )) && mount_active_ds
 
-log "\n$m_complete" ${SECONDS}
+log ""
+log "$m_complete" ${SECONDS}
 printf "$install_log\n" "$ZONEROOT/var/log/$ZONENAME.install$$.log"
 printf "$m_postnote\n"
 printf "$m_postnote2\n"