5 files changed, 37 insertions, 100 deletions
diff --git a/usr/src/pkgdefs/SUNWcakrx.i/postinstall b/usr/src/pkgdefs/SUNWcakrx.i/postinstall
deleted file mode 100644
index 558fbae354..0000000000
--- a/usr/src/pkgdefs/SUNWcakrx.i/postinstall
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-PATH="/usr/bin:/usr/sbin:${PATH}"
-export PATH
-
-# Check xpv_psm entry exists in etc/mach
-grep -w "xpv_psm" $BASEDIR/etc/mach > /dev/null 2>&1
-if [ $? -ne 0 ]
-then
-	echo "xpv_psm" >> $BASEDIR/etc/mach
-fi
-
-exit 0
diff --git a/usr/src/pkgdefs/SUNWcakrx.i/preremove b/usr/src/pkgdefs/SUNWcakrx.i/preremove
deleted file mode 100644
index 6f37c68d1d..0000000000
--- a/usr/src/pkgdefs/SUNWcakrx.i/preremove
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-PATH="/usr/bin:/usr/sbin:${PATH}"
-export PATH
-
-# Remove xpv_psm entry in etc/mach
-grep -v -w "xpv_psm" $BASEDIR/etc/mach > /tmp/mach$$
-mv /tmp/mach$$ $BASEDIR/etc/mach
-
-exit 0
diff --git a/usr/src/pkgdefs/SUNWcakrx.i/prototype_com b/usr/src/pkgdefs/SUNWcakrx.i/prototype_com
index d652f715dd..8ef408cbf5 100644
--- a/usr/src/pkgdefs/SUNWcakrx.i/prototype_com
+++ b/usr/src/pkgdefs/SUNWcakrx.i/prototype_com
@@ -39,10 +39,6 @@
 i pkginfo
 i copyright
 
-# installation scripts
-i postinstall
-i preremove
-
 #
 # source locations relative to the prototype file
 #
diff --git a/usr/src/pkgdefs/SUNWos86r/i.mach b/usr/src/pkgdefs/SUNWos86r/i.mach
index 79892dd9af..aad724f76b 100644
--- a/usr/src/pkgdefs/SUNWos86r/i.mach
+++ b/usr/src/pkgdefs/SUNWos86r/i.mach
@@ -3,9 +3,8 @@
 # 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.
@@ -23,20 +22,26 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2004 Sun Microsystems, Inc.	 All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 PATH="/usr/bin:/usr/sbin:${PATH}"
 export PATH
 
-
 while read src dest
 do
-	if [ ! -f $dest ] ; then
+	if [ ! -f $dest ]; then
 		cp $src $dest
 	else
-		grep '^#pragma' $src > /tmp/newident.$$ 2>/dev/null
+		update=0
+
+		# Check xpv_psm entry exists in etc/mach
+		grep -w "xpv_psm" $dest > /dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			update=1
+		fi
+
 		sed -e '/^ast/d' \
 		    -e '/^compaq/d' \
 		    -e '/^corollary/d' \
@@ -44,15 +49,27 @@ do
 		    -e '/^tpf/d' \
 		    -e '/^wysemp/d' \
 		$dest > /tmp/m.$$
-	   if cmp -s /tmp/m.$$	$dest  > /dev/null 2>&1
-           then
-		:
-	   else
-		cat /tmp/newident.$$ > /tmp/rest.$$
-		sed '/^#pragma.*/d' /tmp/m.$$ >> /tmp/rest.$$
-		cp /tmp/rest.$$ $dest
-	   fi
-	   rm -f /tmp/m.$$ /tmp/rest.$$ /tmp/newident.$$
+		cmp -s /tmp/m.$$ $dest > /dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			update=1
+		fi
+
+		if [ $update -eq 1 ]; then
+			cat $src > /tmp/rest.$$
+			sed -e '/^#/d' \
+			    -e '/^pcplusmp/d' \
+			    -e '/^xpv_psm/d' \
+			    -e '/^ast/d' \
+			    -e '/^compaq/d' \
+			    -e '/^corollary/d' \
+			    -e '/^syspro/d' \
+			    -e '/^tpf/d' \
+			    -e '/^wysemp/d' \
+			    $dest >> /tmp/rest.$$
+			cp /tmp/rest.$$ $dest
+		fi
+
+		rm -f /tmp/m.$$ /tmp/rest.$$
 	fi
 
 done
diff --git a/usr/src/uts/intel/os/mach b/usr/src/uts/intel/os/mach
index 7338de13df..4080a6bd2f 100644
--- a/usr/src/uts/intel/os/mach
+++ b/usr/src/uts/intel/os/mach
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 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,5 +24,5 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 pcplusmp
-
+xpv_psm