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

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
- Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ Copyright 2009 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

@@ -21,12 +21,10 @@
  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"
-
         NOTE:  This service manifest is not editable; its contents will
         be overwritten by package or patch operations, including
         operating system upgrade.  Make customizations in a different
         file.
 -->

@@ -58,10 +56,14 @@
         <!--
           Since updating the boot-archive can take a while on slow machines or
           when there are many glommed kernels to wad up, a longer timeout is
           needed. However if it doesn't finish eventually something up, and
           an error message to trigger further investigation is appropriate.
+
+          Please note that a similar timeout exists in startd, which again
+          runs bootadm at the end of shutdown.  These timeouts should be
+          adjusted in sync with each other.
         -->
         <exec_method
                 type='method'
                 name='start'
                 exec='/lib/svc/method/boot-archive-update'