src/brand/attach
branch2010.2H
changeset 2196 231062cfaba5
parent 2124 74a1732c2d10
child 2572 20cf41d565de
--- a/src/brand/attach	Thu Jan 13 14:07:04 2011 -0800
+++ b/src/brand/attach	Mon Jan 24 14:53:10 2011 -0800
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 . /usr/lib/brand/ipkg/common.ksh
@@ -556,18 +556,20 @@
 	fi
 
 	if [[ ${publisher.keyfile} != "None" ]]; then
-		newloc="$ZONEROOT/$KEYDIR/$(basename ${publisher.keyfile})"
+		relnewloc="$KEYDIR/$(basename ${publisher.keyfile})"
+		newloc="$ZONEROOT/$relnewloc"
 		safe_copy ${publisher.keyfile} $newloc
 		chmod 644 $newloc
 		chown -h root:root $newloc
-		args="$args -k $newloc"
+		args="$args -k $relnewloc"
 	fi
 	if [[ ${publisher.certfile} != "None" ]]; then
-		newloc="$ZONEROOT/$KEYDIR/$(basename ${publisher.certfile})"
+		relnewloc="$KEYDIR/$(basename ${publisher.certfile})"
+		newloc="$ZONEROOT/$relnewloc"
 		safe_copy ${publisher.certfile} $newloc
 		chmod 644 $newloc
 		chown -h root:root $newloc
-		args="$args -c $newloc"
+		args="$args -c $relnewloc"
 	fi
 	LC_ALL=C $PKG unset-publisher $key >/dev/null 2>&1
 	LC_ALL=C $PKG set-publisher $args $key