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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/initpkg/umountall.sh
          +++ new/usr/src/cmd/initpkg/umountall.sh
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  #
  23      -# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
       23 +# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  #       Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
  27   27  #         All Rights Reserved
  28   28  #
  29   29  #
  30   30  
  31   31  usage () {
  32   32          if [ -n "$1" ]; then
  33   33                  echo "umountall: $1" 1>&2
↓ open down ↓ 128 lines elided ↑ open up ↑
 162  162  if [ "$FSType" = "nfs" -a "$LFLAG" = "l" ]; then                        # 6
 163  163          usage "option -l and FSType nfs are incompatible"
 164  164  fi
 165  165  
 166  166  if [ -n "$FFLAG" -a "$FSType" != "nfs"  -a -n "$RFLAG" ]; then          # 7
 167  167          usage "option -r and FSType ${FSType} are incompatible"
 168  168  fi
 169  169  
 170  170  ZONENAME=`zonename`
 171  171  
 172      -# Check and if needed sync the boot archive before unmounting everything.
 173  172  #
 174      -if [ -z "${RFLAG}${NFLAG}${HFLAG}${FSType}" -a "$ZONENAME" = "global" \
 175      -    -a -x /sbin/bootadm ] ; then
 176      -        /sbin/bootadm -a update_all
 177      -fi
 178      -
 179      -
 180      -#
 181  173  # If we are in deferred activation patching, and the caller is 
 182  174  # svc.startd, then exit without unmounting any of the remaining 
 183  175  # file systems since the call path is from shutdown.  Note that
 184  176  # by the time we get here, smf stop methods for nfs, cachefs
 185  177  # etc, will have run.  
 186  178  #
 187  179  if [ -f $DEFERRED_ACTIVATION_PATCH_FLAG ] ; then 
 188  180          ppid=`ps -o ppid= -p $$`        # parent of umountall will be sh
 189  181                                          # from system()
 190  182  
↓ open down ↓ 210 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX