Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-16 01:27:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

supports default mount also on /run/media/jrml (udisk2 compat). minor cleanups to default mountpoint generation. fix #186

Browse Source
This commit is contained in:
Jaromil 2015-01-21 12:17:09 +01:00
parent 4788ee6834
commit ca012e8744
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tomb
View File

@ -1688,31 +1688,22 @@ mount_tomb() {
local tombpath="$1" # First argument is the path to the tomb local tombpath="$1" # First argument is the path to the tomb
[[ -n "$tombpath" ]] || _failure "No tomb name specified for opening." [[ -n "$tombpath" ]] || _failure "No tomb name specified for opening."
_message "Commanded to open tomb ::1 tomb name::" $1 _message "Commanded to open tomb ::1 tomb name::" $tombpath
_check_swap _check_swap
is_valid_tomb $tombpath is_valid_tomb $tombpath
# check file type (if its a Luks fs)
[[ "`file $TOMBPATH`" =~ "luks encrypted file" ]] || {
_warning "::1 tomb file:: is not a valid tomb file" $TOMBFILE
_failure "Operation aborted."
}
_verbose "Tomb found: ::1 tomb path::" $TOMBPATH
_load_key # Try loading new key from option -k and set TOMBKEYFILE _load_key # Try loading new key from option -k and set TOMBKEYFILE
tombmount=${2:-/media/$TOMBFILE} tombmount="$2"
[[ -z "$2" ]] && { [[ "$tombmount" = "" ]] && {
_message "Mountpoint not specified, using default: ::1 mount point::" $tombmount } tombmount=/media/$TOMBFILE
[[ -d /media ]] || { # no /media found, adopting /run/media/$USER (udisk2 compat)
# Check if its already open tombmount=/run/media/$_USER/$TOMBFILE
[[ "`mount -l`" -regex-match "${TOMBFILE}.*\[$TOMBNAME\]" ]] && { }
_warning "::1 tomb name:: is already open." $TOMBNAME _message "Mountpoint not specified, using default: ::1 mount point::" $tombmount
_message "Here below its status is reported:" }
list_tombs $TOMBNAME
return 0 }
_success "Opening ::1 tomb file:: on ::2 mount point::" $TOMBFILE $tombmount _success "Opening ::1 tomb file:: on ::2 mount point::" $TOMBFILE $tombmount
@ -2406,10 +2397,11 @@ umount_tomb() {
_verbose "Performing umount of ::1 mount point::" $tombmount _verbose "Performing umount of ::1 mount point::" $tombmount
sudo umount ${tombmount} sudo umount ${tombmount}
[[ $? = 0 ]] || { _warning "Tomb is busy, cannot umount!"; return 1 } [[ $? = 0 ]] || { _failure "Tomb is busy, cannot umount!" }
# If we used a default mountpoint and is now empty, delete it # If we used a default mountpoint and is now empty, delete it
[[ "$tombmount" == "/media/$tombname.tomb" ]] && { rmdir $tombmount } [[ "$tombmount" -regex-match "[/run]?/media[/$_USER]?/$tombname.tomb" ]] && {
rmdir $tombmount }
sudo cryptsetup luksClose $mapper sudo cryptsetup luksClose $mapper
[[ $? == 0 ]] || { [[ $? == 0 ]] || {