From 269f47de02761bab3b7b28e2007a2bac34f629cc Mon Sep 17 00:00:00 2001
From: Thuy Fettig <Thuy.Fettig@oracle.COM>
Date: Tue, 10 Aug 2010 17:06:51 -0400
Subject: 6968076 implement removal of bsmconv/bsmunconv per PSARC/2010/263
 6968089 Convert /etc/rd2.d/S98deallocate to SMF as part of PSARC/2010/263
 6946887 bsmconv should record DEVICE_ALLOCATION=ON in unlabeled
 device_allocate PSARC/2010/263 Redux: bsmconv(1M), bsmunconv(1M) EOL and
 removal

--HG--
rename : usr/src/cmd/bsmconv/bsmconv.sh => usr/src/cmd/allocate/svc-allocate
---
 usr/src/cmd/initpkg/init.d/Makefile   |  4 +--
 usr/src/cmd/initpkg/init.d/deallocate | 56 -----------------------------------
 usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh |  6 ++--
 3 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 usr/src/cmd/initpkg/init.d/deallocate

(limited to 'usr/src/cmd/initpkg')

diff --git a/usr/src/cmd/initpkg/init.d/Makefile b/usr/src/cmd/initpkg/init.d/Makefile
index 0fbefce422..1638dfa604 100644
--- a/usr/src/cmd/initpkg/init.d/Makefile
+++ b/usr/src/cmd/initpkg/init.d/Makefile
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		../../Makefile.cmd
@@ -32,7 +31,6 @@ i386_PROG=
 PROG=		\
 	README		\
 	cachefs.daemon	\
-	deallocate	\
 	devlinks	\
 	dhcp		\
 	drvconfig	\
diff --git a/usr/src/cmd/initpkg/init.d/deallocate b/usr/src/cmd/initpkg/init.d/deallocate
deleted file mode 100644
index 7ef8aeeb6d..0000000000
--- a/usr/src/cmd/initpkg/init.d/deallocate
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/sbin/sh
-#
-# 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.
-#
-# 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
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-# if the audit state is "disabled" auditconfig returns
-# non-zero exit status unless the c2audit module is loaded;
-# if c2audit is loaded, "disabled" becomes "noaudit" early
-# in the boot cycle and "auditing" only after auditd starts.
-# in both cases, "noaudit" and "auditing", a zero exit status
-# is returned
-
-AUDITCONFIG=/usr/sbin/auditconfig
-
-AUDITCOND=`$AUDITCONFIG -getcond 2> /dev/null`
-if [ $? -ne 0 ]; then
-	exit 0;
-fi
-
-case "$1" in
-'start')
-	/usr/sbin/deallocate -Is
-	;;
- 
-'stop')
-	;;
-
-*)
-        echo "Usage: $0 { start | stop }"
-        exit 1
-        ;;
-esac
-exit 0
diff --git a/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh b/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
index 0094c068cf..4847e18add 100644
--- a/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
+++ b/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
@@ -22,16 +22,14 @@
 #	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
 #	  All Rights Reserved
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 COMMON_STARTLST="\
 20sysetup \
 70uucp \
 73cachefs.daemon \
-82mkdtab \
-98deallocate"
+82mkdtab"
 
 INSDIR=${ROOT}/etc/rc2.d
 
-- 
cgit v1.2.3