Просмотр исходного кода

Umount/mount even if the process is already dead

Zachary Kotlarek 12 лет назад
Родитель
Сommit
ba06877494
1 измененных файлов с 9 добавлено и 7 удалено
  1. 9 7
      backup/checkMount.sh

+ 9 - 7
backup/checkMount.sh

@@ -39,16 +39,18 @@ if [ $FAILED -gt 0 ]; then
 
 	DASH_NAME="`echo "${BASE_REMOTE}" | cut -d '/' -f 2- | sed 's%/%-%g'`"
 	PID=`ps ax -o pid=,command= | grep 'mount.davfs' | grep "${BASE_REMOTE}" | awk '{print $1}'`
-	if [ -n "${PID}" ] && [ $PID -gt 1 ]; then
-		echo 'Resetting WebDAV mount' 1>&2
 
-		${SUDO} kill -9 $PID
-		${SUDO} umount "${BASE_REMOTE}"
-		${SUDO} rm "/var/run/mount.davfs/${DASH_NAME}.pid"
-		${SUDO} mount "${BASE_REMOTE}"
+	echo 'Resetting WebDAV mount' 1>&2
 
-		exit 1
+	if [ -n "${PID}" ] && [ $PID -gt 1 ]; then
+		${SUDO} kill -9 $PID
 	fi
+
+	${SUDO} umount "${BASE_REMOTE}"
+	${SUDO} rm -f "/var/run/mount.davfs/${DASH_NAME}.pid"
+	${SUDO} mount "${BASE_REMOTE}"
+
+	exit 1
 fi
 
 # Always exit cleanly