--- a/usr/src/pkgdefs/common_files/i.devpolicy Thu Apr 13 05:43:14 2006 -0700
+++ b/usr/src/pkgdefs/common_files/i.devpolicy Thu Apr 13 11:40:49 2006 -0700
@@ -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,7 +22,7 @@
#
# ident "%Z%%M% %I% %E% SMI"
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# NOTE: When a change is made to the source file for
@@ -50,43 +49,43 @@
rm -f $dest.$$
# potential additions
- additions="bge dnet ibd icmp icmp6 openeepr random vni ipf pfil scsi_vhci"
+ additions="aggr aggr:ctl bge dld:ctl dnet ibd icmp icmp6 openeepr random vni ipf pfil scsi_vhci"
for dev in $additions
do
# if an entry for this driver exists in the source
# file...
- grep "$dev" $src > /dev/null 2>&1
+ grep "$dev[ ]" $src > /dev/null 2>&1
if [ $? = 0 ] ; then
# ...and no entry exists in the destination
# file...
- grep "$dev" $dest > /dev/null 2>&1
+ grep "$dev[ ]" $dest > /dev/null 2>&1
if [ $? != 0 ] ; then
# ...then add the entry from
# the source file to the
# destination file.
- grep "$dev" $src >> $dest
+ grep "$dev[ ]" $src >> $dest
fi
fi
done
# potential deletions
- deletions="elx"
+ deletions="elx dld"
for dev in $deletions
do
# if an entry for this driver exists in the destination
# file...
- grep "$dev" $dest > /dev/null 2>&1
+ grep "$dev[ ]" $dest > /dev/null 2>&1
if [ $? = 0 ] ; then
# ...and no entry exists in the source
# file...
- grep "$dev" $src > /dev/null 2>&1
+ grep "$dev[ ]" $src > /dev/null 2>&1
if [ $? != 0 ] ; then
# ...then remove the entry from
# the destination file.
cp $dest $dest.$$
- grep -v "$dev" $dest.$$ > $dest
+ grep -v "$dev[ ]" $dest.$$ > $dest
rm -f $dest.$$
fi
fi