aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-03-07 15:53:45 -0500
committerBill Nottingham <notting@redhat.com>2011-04-12 09:55:33 -0400
commit17d1d3a9085d55a1e81994259988943074f8186d (patch)
treed019582e31ebc2743d79a997d91bb9b5dc5f58c9
parent3c55393582a6215e4a8dd1fe37a5272241478df6 (diff)
downloadinitscripts-17d1d3a9085d55a1e81994259988943074f8186d.tar
initscripts-17d1d3a9085d55a1e81994259988943074f8186d.tar.gz
initscripts-17d1d3a9085d55a1e81994259988943074f8186d.tar.bz2
initscripts-17d1d3a9085d55a1e81994259988943074f8186d.tar.xz
initscripts-17d1d3a9085d55a1e81994259988943074f8186d.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/functions4
1 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index f3dfc516..43550a2d 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -119,7 +119,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() {
@@ -129,7 +129,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