diff options
| author | Vitaliy Gusev <gusev.vitaliy@nexenta.com> | 2012-06-12 23:41:19 -0400 |
|---|---|---|
| committer | Vitaliy Gusev <gusev.vitaliy@nexenta.com> | 2012-06-12 23:41:19 -0400 |
| commit | 4191ce11b7a4c9ac19d88acf17d30fd50a4464b0 (patch) | |
| tree | 9bea6e166c856b6bc76c4f8ffe761e019b2922d3 /usr/src/cmd/fs.d/nfs/svc/nfs-server | |
| parent | fc98fea58e89224f6f13d7fae246d6cb5dfa35ea (diff) | |
| download | illumos-joyent-4191ce11b7a4c9ac19d88acf17d30fd50a4464b0.tar.gz | |
2614 nfs logging works incorrectly
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: T Nguyen <truongqnguien@gmail.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/cmd/fs.d/nfs/svc/nfs-server')
| -rw-r--r-- | usr/src/cmd/fs.d/nfs/svc/nfs-server | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/usr/src/cmd/fs.d/nfs/svc/nfs-server b/usr/src/cmd/fs.d/nfs/svc/nfs-server index 09bb057e43..b0c6d155a5 100644 --- a/usr/src/cmd/fs.d/nfs/svc/nfs-server +++ b/usr/src/cmd/fs.d/nfs/svc/nfs-server @@ -21,6 +21,7 @@ # # # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 Nexenta Systems, Inc. All rights reserved. # # Start/stop processes required for server NFS @@ -132,26 +133,6 @@ case "$1" in /usr/sbin/sharemgr stop -P nfs -a - # - # Wait up to 10 seconds for nfslogd to gracefully handle SIGHUP - # - /usr/bin/pkill -HUP -x -u 0 -z $zone nfslogd - wtime=10 - - while [ $wtime -gt 0 ]; do - /usr/bin/pgrep -x -u 0 -z $zone nfslogd >/dev/null || break - wtime=`expr $wtime - 1` - sleep 1 - done - - # - # Kill nfslogd more forcefully if it did not shutdown during - # the grace period - # - if [ $wtime -eq 0 ]; then - /usr/bin/pkill -TERM -x -u 0 -z $zone nfslogd - fi - # Kill any processes left in service contract smf_kill_contract $2 TERM 1 [ $? -ne 0 ] && exit 1 |