diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-03-07 15:53:45 -0500 |
|---|---|---|
| committer | Petr Lautrbach <plautrba@redhat.com> | 2011-03-10 10:50:45 +0100 |
| commit | 7998d46d7fd236ec9b2782936949cbb40a0f4028 (patch) | |
| tree | 4d091b8f550322bde60030eb776d03530d03bdca | |
| parent | ce68d573f601980886f1dd6785478dd78f678a0d (diff) | |
| download | initscripts-7998d46d7fd236ec9b2782936949cbb40a0f4028.tar initscripts-7998d46d7fd236ec9b2782936949cbb40a0f4028.tar.gz initscripts-7998d46d7fd236ec9b2782936949cbb40a0f4028.tar.bz2 initscripts-7998d46d7fd236ec9b2782936949cbb40a0f4028.tar.xz initscripts-7998d46d7fd236ec9b2782936949cbb40a0f4028.zip | |
Don't do force/lazy umount for the first nfs umount. (#676851, <jlayton@redhat.com>)
This can cause hung tasks that aren't cleaned up or killed properly,
as their dangling references won't get caught.
| -rw-r--r-- | 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 6855b3bb..44b824ae 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -81,7 +81,7 @@ __fgrep() { return 1 } -# __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() { @@ -91,7 +91,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 |