diff options
| author | Dan Price <daniel.price@oracle.com> | 2010-07-23 16:15:32 -0700 |
|---|---|---|
| committer | Dan Price <daniel.price@oracle.com> | 2010-07-23 16:15:32 -0700 |
| commit | 4e49521adb662f60c483905731d15f9bf1ba2efb (patch) | |
| tree | fac51814f487764e553d48b71d1b3998838e343c /usr/src/cmd/initpkg | |
| parent | 22ce47f7854e0848adf05feb75b97e65da1c8d8f (diff) | |
| download | illumos-joyent-4e49521adb662f60c483905731d15f9bf1ba2efb.tar.gz | |
6970361 delete deferred activation patching hooks from nevada ON
Diffstat (limited to 'usr/src/cmd/initpkg')
| -rw-r--r-- | usr/src/cmd/initpkg/umountall.sh | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/usr/src/cmd/initpkg/umountall.sh b/usr/src/cmd/initpkg/umountall.sh index e3e93ff98a..535a89c792 100644 --- a/usr/src/cmd/initpkg/umountall.sh +++ b/usr/src/cmd/initpkg/umountall.sh @@ -20,8 +20,7 @@ # CDDL HEADER END # # -# 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. # # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T # All Rights Reserved @@ -71,9 +70,6 @@ MNTTAB=/etc/mnttab PATH=/sbin:/usr/sbin:/usr/bin -DEFERRED_ACTIVATION_PATCH_FLAG="/var/run/.patch_loopback_mode" -SVC_STARTD="/lib/svc/bin/svc.startd" - # Clear these in case they were already set in our inherited environment. FSType= FFLAG= @@ -170,24 +166,6 @@ fi ZONENAME=`zonename` # -# If we are in deferred activation patching, and the caller is -# svc.startd, then exit without unmounting any of the remaining -# file systems since the call path is from shutdown. Note that -# by the time we get here, smf stop methods for nfs, cachefs -# etc, will have run. -# -if [ -f $DEFERRED_ACTIVATION_PATCH_FLAG ] ; then - ppid=`ps -o ppid= -p $$` # parent of umountall will be sh - # from system() - - ppid=`ps -o ppid= -p $ppid` # parent of sh will be svc.startd - COMM=`ps -o comm= -p $ppid` - if [ "$COMM" = "$SVC_STARTD" ] ; then - exit - fi -fi - -# # Take advantage of parallel unmounting at this point if we have no # criteria to match and we are in the global zone # |