--- 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
--- a/src/pkg/manifests/system%2Fzones%2Fbrand%2Fipkg.p5m Thu Jan 13 14:07:04 2011 -0800
+++ b/src/pkg/manifests/system%2Fzones%2Fbrand%2Fipkg.p5m Mon Jan 24 14:53:10 2011 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/system/zones/brand/ipkg@$(PKGVERS)
@@ -27,7 +27,7 @@
set name=info.classification value=org.opensolaris.category.2008:System/Packaging
set name=com.oracle.service.bugid \
last-fmri=package/[email protected],5.11-0.151.0.1:20101104T233545Z \
- value=7011650
+ value=7011650 value=7012085
set name=variant.arch value=$(ARCH)
dir path=etc