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

local definition of variables in mount function

Browse Source
This commit is contained in:
Jaromil 2024-09-01 07:56:53 +02:00
parent 653609a4b9
commit 4783456814
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tomb
View File

@ -2286,7 +2286,7 @@ mount_tomb() {
_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" local tombmount="$2"
[[ -z "$tombmount" ]] && { [[ -z "$tombmount" ]] && {
tombmount="/media/$TOMBNAME" tombmount="/media/$TOMBNAME"
[[ -d /media ]] || { # no /media found, adopting /run/media/$USER (udisks2 compat) [[ -d /media ]] || { # no /media found, adopting /run/media/$USER (udisks2 compat)
@ -2313,14 +2313,14 @@ mount_tomb() {
_message "This tomb is a valid LUKS encrypted device." _message "This tomb is a valid LUKS encrypted device."
luksdump="`_sudo cryptsetup luksDump ${TOMBPATH}`" local luksdump="`_sudo cryptsetup luksDump ${TOMBPATH}`"
tombdump=(`print $luksdump | awk ' local tombdump=(`print $luksdump | awk '
/^Cipher name/ {print $3} /^Cipher name/ {print $3}
/^Cipher mode/ {print $3} /^Cipher mode/ {print $3}
/^Hash spec/ {print $3}'`) /^Hash spec/ {print $3}'`)
_message "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\"" $tombdump[1] $tombdump[2] $tombdump[3] _message "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\"" $tombdump[1] $tombdump[2] $tombdump[3]
slotwarn=`print $luksdump | awk ' local slotwarn=`print $luksdump | awk '
BEGIN { zero=0 } BEGIN { zero=0 }
/^Key slot 0/ { zero=1 } /^Key slot 0/ { zero=1 }
/^Key slot.*ENABLED/ { if(zero==1) print "WARN" }'` /^Key slot.*ENABLED/ { if(zero==1) print "WARN" }'`
@ -2346,14 +2346,14 @@ mount_tomb() {
_failure "Failure mounting the encrypted file." } _failure "Failure mounting the encrypted file." }
# array: [ cipher, keysize, loopdevice ] # array: [ cipher, keysize, loopdevice ]
tombstat=(`_sudo cryptsetup status ${TOMBMAPPER} | awk ' local tombstat=(`_sudo cryptsetup status ${TOMBMAPPER} | awk '
/cipher:/ {print $2} /cipher:/ {print $2}
/keysize:/ {print $2} /keysize:/ {print $2}
/device:/ {print $2}'`) /device:/ {print $2}'`)
_success "Success unlocking tomb ::1 tomb name::" $TOMBNAME _success "Success unlocking tomb ::1 tomb name::" $TOMBNAME
_verbose "Key size is ::1 size:: for cipher ::2 cipher::" $tombstat[2] $tombstat[1] _verbose "Key size is ::1 size:: for cipher ::2 cipher::" $tombstat[2] $tombstat[1]
filesystem=`_detect_filesystem /dev/mapper/${TOMBMAPPER}` local filesystem=`_detect_filesystem /dev/mapper/${TOMBMAPPER}`
_message "Filesystem detected: ::1 filesystem::" $filesystem _message "Filesystem detected: ::1 filesystem::" $filesystem
# TODO: check if FS is supported, else close luks # TODO: check if FS is supported, else close luks