Mercurial > illumos > illumos-gate

changeset 12808:8772e1ec4956

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6936334 zoneadm attach -d on existing dataset deletes the dataset
author <gerald.jelinek@sun.com>
date Thu, 08 Jul 2010 16:40:54 -0600
parents 75bba6ac5f93
children 02bf8a1e6063
files usr/src/lib/brand/solaris10/zone/attach.ksh
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/brand/solaris10/zone/attach.ksh	Thu Jul 08 10:15:06 2010 -0700
+++ b/usr/src/lib/brand/solaris10/zone/attach.ksh	Thu Jul 08 16:40:54 2010 -0600
@@ -20,8 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 . /usr/lib/brand/solaris10/common.ksh
@@ -58,7 +57,7 @@
 # If the attach failed then clean up the ZFS datasets we created.
 trap_exit()
 {
-	if [[ $EXIT_CODE != $ZONE_SUBPROC_OK && "$install_media" != "-" ]]; then
+	if [[ $EXIT_CODE != $ZONE_SUBPROC_OK && $rm_ds == 1 ]]; then
 		/usr/lib/brand/solaris10/uninstall $ZONENAME $ZONEPATH -F
 	fi
 
@@ -67,6 +66,7 @@
 
 EXIT_CODE=$ZONE_SUBPROC_USAGE
 install_media="-"
+rm_ds=0
 
 trap trap_cleanup INT
 trap trap_exit EXIT
@@ -105,6 +105,10 @@
 			fi
 		 	inst_type="directory"
 			install_media="$OPTARG"
+			# '-d -' means use the existing zonepath.
+			if [[ "$install_media" == "$ZONEPATH" ]]; then
+				install_media="-"
+			fi
 			;;
 		n)	noexecute=1 ;;
 		r)
@@ -157,6 +161,7 @@
 		if (( $? == 0 )); then
 			vlog "$m_zfs"
 			DATASET="$zds/$pnm"
+			rm_ds=1
 		else
 			log "$f_zfs" "$zds/$pnm"
 		fi