Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-12-23 02:28:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix is_valid_tomb check for already mounted tombs

Browse Source 
also added some more verbosity on debug
This commit is contained in:
Jaromil 2016-12-26 20:40:23 +01:00
parent db976a5210
commit 14cba81f6e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tomb
View File

@ -507,20 +507,27 @@ is_valid_tomb() {
_warning "Tomb file is not writable: ::1 tomb file::" $1 _warning "Tomb file is not writable: ::1 tomb file::" $1
_fail=1 _fail=1
} }
_verbose "tomb file is readable"
[[ ! -f "$1" ]] && { [[ ! -f "$1" ]] && {
_warning "Tomb file is not a regular file: ::1 tomb file::" $1 _warning "Tomb file is not a regular file: ::1 tomb file::" $1
_fail=1 _fail=1
} }
_verbose "tomb file is a regular file"
[[ ! -s "$1" ]] && { [[ ! -s "$1" ]] && {
_warning "Tomb file is empty (zero length): ::1 tomb file::" $1 _warning "Tomb file is empty (zero length): ::1 tomb file::" $1
_fail=1 _fail=1
} }
_verbose "tomb file is not empty"
_uid="`zstat +uid $1`" _uid="`zstat +uid $1`"
[[ "$_uid" = "$UID" ]] || { [[ "$_uid" = "$UID" ]] || {
_user="`zstat -s +uid $1`" _user="`zstat -s +uid $1`"
_warning "Tomb file is owned by another user: ::1 tomb owner::" $_user _warning "Tomb file is owned by another user: ::1 tomb owner::" $_user
} }
_verbose "tomb is not owned by another user"
[[ $_fail = 1 ]] && { [[ $_fail = 1 ]] && {
_failure "Tomb command failed: ::1 command name::" $subcommand _failure "Tomb command failed: ::1 command name::" $subcommand
} }
@ -536,9 +543,12 @@ is_valid_tomb() {
_plot $1 # Set TOMB{PATH,DIR,FILE,NAME} _plot $1 # Set TOMB{PATH,DIR,FILE,NAME}
# Tomb already mounted (or we cannot alter it) # Tomb already mounted (or we cannot alter it)
[[ "`mount -l`" -regex-match "${TOMBFILE}.*\[$TOMBNAME\]$" ]] && { [[ "`mount -l |
awk -vtomb="[$TOMBNAME]" '
/^\/dev\/mapper\/tomb/ { if($7==tomb) print $1 }'`" = "" ]] || {
_failure "Tomb is currently in use: ::1 tomb name::" $TOMBNAME _failure "Tomb is currently in use: ::1 tomb name::" $TOMBNAME
} }
_verbose "tomb file is not currently in use"
_message "Valid tomb file found: ::1 tomb path::" $TOMBPATH _message "Valid tomb file found: ::1 tomb path::" $TOMBPATH