diff options
| author | jacobs <none@none> | 2008-01-24 13:21:17 -0800 |
|---|---|---|
| committer | jacobs <none@none> | 2008-01-24 13:21:17 -0800 |
| commit | 004f51e0c1165c721e405c15c778669d0bcfa6e4 (patch) | |
| tree | 5c8191fa938ce43434780a9edeb1801e32eb7977 /usr | |
| parent | 2fce8260ab825d7f8e4b67452e5c0e17bb260e65 (diff) | |
| download | illumos-gate-004f51e0c1165c721e405c15c778669d0bcfa6e4.tar.gz | |
6636885 integration of 4144591 likely taking action postinstall in incorrect pkg
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/pkgdefs/SUNWpcr/postinstall.tmpl | 19 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpsr/postinstall | 10 |
2 files changed, 14 insertions, 15 deletions
diff --git a/usr/src/pkgdefs/SUNWpcr/postinstall.tmpl b/usr/src/pkgdefs/SUNWpcr/postinstall.tmpl index 8064aa2845..b695c38822 100644 --- a/usr/src/pkgdefs/SUNWpcr/postinstall.tmpl +++ b/usr/src/pkgdefs/SUNWpcr/postinstall.tmpl @@ -2,15 +2,11 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -25,6 +21,9 @@ # # CDDL HEADER END # +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# # Deconfigure the old SAF Listeners # @@ -102,4 +101,12 @@ EOF cp /tmp/p.$$ ${PCONF} fi +# This works around the problem of legacy cleanup service removal until +# r.manifest is fixed to work on alternate pkg root. +if [ "${PKG_INSTALL_ROOT:-/}" != "/" ] ; then + echo "/usr/sbin/svccfg delete -f svc:/application/print/cleanup 2>/dev/null" >> \ + $BASEDIR/var/svc/profile/upgrade +fi + + exit 0 diff --git a/usr/src/pkgdefs/SUNWpsr/postinstall b/usr/src/pkgdefs/SUNWpsr/postinstall index 52034b5441..5e718eab78 100644 --- a/usr/src/pkgdefs/SUNWpsr/postinstall +++ b/usr/src/pkgdefs/SUNWpsr/postinstall @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -67,12 +67,4 @@ if [ -f $PPDTMPFILE ] ; then fi fi -# This works around the problem of legacy cleanup service removal until -# r.manifest is fixed to work on alternate pkg root. -if [ "${PKG_INSTALL_ROOT:-/}" != "/" ] ; then - echo "/usr/sbin/svccfg delete -f svc:/application/print/cleanup" >> \ - $BASEDIR/var/svc/profile/upgrade - -fi - exit 0 |