Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-09-24 18:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

failed bind-hooks (missing target) no more abort the mount operation

Browse Source 
a warning is printed and the mounting goes forward without the hooks
This commit is contained in:
Jaromil 2017-02-20 19:34:51 +01:00
parent e37982d114
commit 3f06bce8eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tomb
View File

@ -2108,7 +2108,7 @@ exec_safe_bind_hooks() {
[[ -r "$mnt/bind-hooks" ]] || { [[ -r "$mnt/bind-hooks" ]] || {
_verbose "bind-hooks not found in ::1 mount point::" $mnt _verbose "bind-hooks not found in ::1 mount point::" $mnt
return 1 } return 0 }
typeset -Al maps # Maps of files and directories to mount typeset -Al maps # Maps of files and directories to mount
typeset -al mounted # Track already mounted files and directories typeset -al mounted # Track already mounted files and directories
@ -2134,7 +2134,7 @@ exec_safe_bind_hooks() {
[[ "${${maps[$dir]}[1]}" == "/" || "${${maps[$dir]}[1,2]}" == ".." ]] && { [[ "${${maps[$dir]}[1]}" == "/" || "${${maps[$dir]}[1,2]}" == ".." ]] && {
_warning "bind-hooks map format: local/to/tomb local/to/\$HOME. Rolling back" _warning "bind-hooks map format: local/to/tomb local/to/\$HOME. Rolling back"
for dir in ${mounted}; do _sudo umount $dir; done for dir in ${mounted}; do _sudo umount $dir; done
return 1 } return 0 }
if [[ ! -r "$HOME/${maps[$dir]}" ]]; then if [[ ! -r "$HOME/${maps[$dir]}" ]]; then
_warning "bind-hook target not existent, skipping ::1 home::/::2 subdir::" $HOME ${maps[$dir]} _warning "bind-hook target not existent, skipping ::1 home::/::2 subdir::" $HOME ${maps[$dir]}