#140 fix zpool names in brand scripts

TritonDataCenter · Dec 18, 2012 · 6acf595 · 6acf595
1 parent 3ec1ea2
commit 6acf595
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/overlay/generic/usr/lib/brand/joyent-minimal/common.ksh b/overlay/generic/usr/lib/brand/joyent-minimal/common.ksh
@@ -31,8 +31,8 @@ final_setup()
 	# samples from JPC.
 	rm -rf $ZONEPATH/cores
 	CORE_QUOTA=102400
-	zfs create -o quota=${CORE_QUOTA}m -o mountpoint=/zones/$bname/cores \
-	    zones/cores/$bname
+	zfs create -o quota=${CORE_QUOTA}m -o mountpoint=/${PDS_NAME}/$bname/cores \
+	    ${PDS_NAME}/cores/$bname
 
 	chmod 700 $ZONEPATH
 

diff --git a/overlay/generic/usr/lib/brand/joyent-minimal/juninstall b/overlay/generic/usr/lib/brand/joyent-minimal/juninstall
@@ -60,7 +60,7 @@ fi
 
 ORIGIN=`zfs get -H -ovalue  origin $PDS_NAME/$bname`
 
-zfs destroy -rF zones/cores/$bname
+zfs destroy -rF $PDS_NAME/cores/$bname
 zfs destroy -rF $PDS_NAME/$bname
 (( $? != 0 )) && (echo "processes in zone: " && fuser $ZONEPATH)
 

diff --git a/overlay/generic/usr/lib/brand/joyent/common.ksh b/overlay/generic/usr/lib/brand/joyent/common.ksh
@@ -31,8 +31,8 @@ final_setup()
 	# samples from JPC.
 	rm -rf $ZONEPATH/cores
 	CORE_QUOTA=102400
-	zfs create -o quota=${CORE_QUOTA}m -o mountpoint=/zones/$bname/cores \
-	    zones/cores/$bname
+	zfs create -o quota=${CORE_QUOTA}m -o mountpoint=/${PDS_NAME}/$bname/cores \
+	    ${PDS_NAME}/cores/$bname
 
 	chmod 700 $ZONEPATH
 

diff --git a/overlay/generic/usr/lib/brand/joyent/juninstall b/overlay/generic/usr/lib/brand/joyent/juninstall
@@ -60,7 +60,7 @@ fi
 
 ORIGIN=`zfs get -H -ovalue  origin $PDS_NAME/$bname`
 
-zfs destroy -rF zones/cores/$bname
+zfs destroy -rF $PDS_NAME/cores/$bname
 zfs destroy -rF $PDS_NAME/$bname
 (( $? != 0 )) && (echo "processes in zone: " && fuser $ZONEPATH)
 

diff --git a/overlay/generic/usr/lib/brand/kvm/common.ksh b/overlay/generic/usr/lib/brand/kvm/common.ksh
@@ -43,6 +43,6 @@ final_setup()
 	# such that it will protect the system from a single run-away, but
 	# still allow us to get most cores.
 	rm -rf $ZONEPATH/cores
-	zfs create -o quota=${CORE_QUOTA}m -o mountpoint=/zones/$bname/cores \
-	    zones/cores/$bname
+	zfs create -o quota=${CORE_QUOTA}m -o mountpoint=/${PDS_NAME}/$bname/cores \
+	    ${PDS_NAME}/cores/$bname
 }
diff --git a/overlay/generic/usr/lib/brand/kvm/kuninstall b/overlay/generic/usr/lib/brand/kvm/kuninstall
@@ -68,7 +68,7 @@ done
 
 ORIGIN=`zfs get -H -ovalue  origin $PDS_NAME/$bname`
 
-zfs destroy -rF zones/cores/$bname
+zfs destroy -rF $PDS_NAME/cores/$bname
 zfs destroy -rF $PDS_NAME/$bname
 [ "$ORIGIN" != "-" ] && zfs destroy -F $ORIGIN