6805730 some simple changes would make 'init 5' much faster
6809492 startd shouldn't let hung subprocesses impede shutdown

@@ -1,13 +1,12 @@
 #!/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.
+# 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.

@@ -19,14 +18,13 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2000-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident  "%Z%%M% %I%     %E% SMI"
 
 PATH=/sbin:/usr/bin:/usr/sbin; export PATH
 PPPDIR=/etc/ppp; export PPPDIR
 
 case "$1" in

@@ -56,13 +54,12 @@
                 /usr/lib/inet/pppoed >/dev/null
         fi
         ;;
 
 'stop')
-        /usr/bin/pkill -x pppd
-        sleep 1
-        /usr/bin/pkill -x pppoed
+        /usr/bin/pkill -z `/sbin/zonename` -x pppd && sleep 1
+        /usr/bin/pkill -z `/sbin/zonename` -x pppoed
 
         # Use ifconfig to make the interfaces down just in case
         if [ -f $PPPDIR/ifconfig ]; then
                 nawk '/ifconfig[        ]*sppp/ { \
                         system("ifconfig " $2 " down"); \