aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/init.d/functions
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-03-07 15:53:45 -0500
committerBill Nottingham <notting@redhat.com>2011-03-07 15:53:45 -0500
commita9b0d6b5c655da96783851d5304c4d800d4e4553 (patch)
tree9079f321e3705d8250a63f6d32268d1fedf1c482 /rc.d/init.d/functions
parent755c08720291006cfd8c16f3fb3c2c7987b8a944 (diff)
downloadinitscripts-a9b0d6b5c655da96783851d5304c4d800d4e4553.tar
initscripts-a9b0d6b5c655da96783851d5304c4d800d4e4553.tar.gz
initscripts-a9b0d6b5c655da96783851d5304c4d800d4e4553.tar.bz2
initscripts-a9b0d6b5c655da96783851d5304c4d800d4e4553.tar.xz
initscripts-a9b0d6b5c655da96783851d5304c4d800d4e4553.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.
Diffstat (limited to 'rc.d/init.d/functions')
-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 01cfed8c..ff6ac88c 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -124,7 +124,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() {
@@ -134,7 +134,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