diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2015-06-09 10:23:30 +0200 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2015-06-09 10:58:16 +0200 |
| commit | 2bffe33b8d3ce294a3d1f10c3fcd6c6967192b74 (patch) | |
| tree | 0557901e8df7a9cc3378607f2df6d4a70c6106ca | |
| parent | 04bcc9ccc8cd64357d8a0b35d1e33aa2e87b422c (diff) | |
Improve setup.d/11mount-ssh to recover sessions
Change-Id: I3338b634bf1711d6be16ce58127ab52d8ec76aeb
| -rwxr-xr-x | setup.d/11mount-ssh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |