diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-03-07 15:53:45 -0500 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2011-04-19 16:23:51 +0200 |
| commit | c0b0f528c986558a14225b07c73d4d881278f98d (patch) | |
| tree | 43f37e6a35096c99773075dd4c689d239a20a087 | |
| parent | 24d93df5be5d6536addafe4cf598db1935c96063 (diff) | |
| download | initscripts-c0b0f528c986558a14225b07c73d4d881278f98d.tar initscripts-c0b0f528c986558a14225b07c73d4d881278f98d.tar.gz initscripts-c0b0f528c986558a14225b07c73d4d881278f98d.tar.bz2 initscripts-c0b0f528c986558a14225b07c73d4d881278f98d.tar.xz initscripts-c0b0f528c986558a14225b07c73d4d881278f98d.zip | |
Don't do force/lazy umount for the first nfs umount. (#676851, <jlayton@redhat.com>)
[Harald Hoyer <harald@redhat.com>: backport of a9b0d6b5c65]
This can cause hung tasks that aren't cleaned up or killed properly,
as their dangling references won't get caught.
| -rwxr-xr-x | rc.d/init.d/functions | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 8aa7b30f..42810bc6 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -73,7 +73,7 @@ __readlink() { ls -bl "$@" 2>/dev/null| awk '{ print $NF }' } -# __umount_loop awk_program fstab_file first_msg retry_msg umount_args +# __umount_loop awk_program fstab_file first_msg retry_msg retry_umount_args # awk_program should process fstab_file and return a list of fstab-encoded # paths; it doesn't have to handle comments in fstab_file. __umount_loop() { @@ -83,7 +83,7 @@ __umount_loop() { remaining=$(LC_ALL=C awk "/^#/ {next} $1" "$2" | sort -r) while [ -n "$remaining" -a "$retry" -gt 0 ]; do if [ "$retry" -eq 3 ]; then - action "$3" fstab-decode umount $5 $remaining + action "$3" fstab-decode umount '' $remaining else action "$4" fstab-decode umount $5 $remaining fi |