From 2bffe33b8d3ce294a3d1f10c3fcd6c6967192b74 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Tue, 9 Jun 2015 10:23:30 +0200
Subject: Improve setup.d/11mount-ssh to recover sessions

Change-Id: I3338b634bf1711d6be16ce58127ab52d8ec76aeb
---
 setup.d/11mount-ssh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.d/11mount-ssh b/setup.d/11mount-ssh
index d9b3642..5cc2c4c 100755
--- a/setup.d/11mount-ssh
+++ b/setup.d/11mount-ssh
@@ -34,7 +34,8 @@ if [ "$ACTION" = "setup-stop" -o "$ACTION" = "setup-recover" ] \
     && [ -h "${SYMLINK_PATH}" ]; then
     SOCK_PATH="${CHROOT_PATH}/$(readlink "${SYMLINK_PATH}")"
     info "Unmounting ${SOCK_PATH}"
-    umount -f "${SOCK_PATH}"
+    # When recovering, $SOCK_PATH will be a normal file, so don't fail unmount
+    umount -f "${SOCK_PATH}" 2>/dev/null || ! [ -S "${SOCK_PATH}" ]
     rm -f "${SYMLINK_PATH}"
 fi
 
-- 
cgit v1.2.3