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

correct rendering of dev mapper filename and use of is_valid_tomb

Browse Source
This commit is contained in:
Jaromil 2014-11-14 19:13:48 +01:00
parent 50ce03d5f5
commit 949a8c19e7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tomb
View File

@ -1291,7 +1291,7 @@ dig_tomb() {
[[ $tombsize -ge 10 ]] || _failure "Tombs can't be smaller than 10 megabytes" [[ $tombsize -ge 10 ]] || _failure "Tombs can't be smaller than 10 megabytes"
_check_swap # Ensure the available memory is safe to use _check_swap # Ensure the available memory is safe to use
_plot $tombpath # Set TOMB{PATH,DIR,FILE,NAME} is_valid_tomb $tombpath # Set TOMB{PATH,DIR,FILE,NAME}
[[ -e $TOMBPATH ]] && { [[ -e $TOMBPATH ]] && {
_warning "A tomb exists already. I'm not digging here:" _warning "A tomb exists already. I'm not digging here:"
@ -1430,7 +1430,7 @@ lock_tomb_with_key() {
return 1 return 1
} }
_plot $tombpath is_valid_tomb $tombpath
_message "Commanded to lock tomb ::1 tomb file::" $TOMBFILE _message "Commanded to lock tomb ::1 tomb file::" $TOMBFILE
@ -1524,7 +1524,7 @@ change_tomb_key() {
} }
_check_swap _check_swap
_plot $tombpath is_valid_tomb $tombpath
lo_mount $TOMBPATH lo_mount $TOMBPATH
nstloop=`lo_new` nstloop=`lo_new`
@ -1609,7 +1609,7 @@ mount_tomb() {
_message "Commanded to open tomb ::1 tomb name::" $1 _message "Commanded to open tomb ::1 tomb name::" $1
_check_swap _check_swap
_plot $tombpath is_valid_tomb $tombpath
# check file type (if its a Luks fs) # check file type (if its a Luks fs)
file $TOMBPATH | grep -i 'luks encrypted file' 2>&1 > /dev/null file $TOMBPATH | grep -i 'luks encrypted file' 2>&1 > /dev/null
@ -1662,7 +1662,8 @@ mount_tomb() {
# save date of mount in minutes since 1970 # save date of mount in minutes since 1970
mapdate=`date +%s` mapdate=`date +%s`
mapper="tomb.${tombname}.${mapdate}.`basename $nstloop`" mapper="tomb.$TOMBNAME.$mapdate.$(basename $nstloop)"
_verbose "dev mapper device: ::1 mapper::" $mapper _verbose "dev mapper device: ::1 mapper::" $mapper
_verbose "Tomb key: ::1 key file::" $TOMBKEYFILE _verbose "Tomb key: ::1 key file::" $TOMBKEYFILE
@ -2161,7 +2162,7 @@ resize_tomb() {
[[ -z "$newtombsize" ]] && { [[ -z "$newtombsize" ]] && {
_failure "Aborting operations: new size was not specified, use -s" } _failure "Aborting operations: new size was not specified, use -s" }
_plot $tombpath # Set TOMB{PATH,DIR,FILE,NAME} is_valid_tomb $tombpath # Set TOMB{PATH,DIR,FILE,NAME}
_load_key # Try loading new key from option -k and set TOMBKEYFILE _load_key # Try loading new key from option -k and set TOMBKEYFILE
@ -2204,7 +2205,7 @@ resize_tomb() {
nstloop=`lo_new` nstloop=`lo_new`
mapdate=`date +%s` mapdate=`date +%s`
mapper="tomb.${tombname}.${mapdate}.`basename $nstloop`" mapper="tomb.$TOMBNAME.$mapdate.$(basename $nstloop)"
print -n - $TOMBSECRET | \ print -n - $TOMBSECRET | \
cryptsetup --key-file - luksOpen ${nstloop} ${mapper} cryptsetup --key-file - luksOpen ${nstloop} ${mapper}