utilities/Tomb
utilities/Tomb
1
0
Fork 0
mirror of https://github.com/dyne/Tomb synced 2024-10-18 15:42:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Address non-zero exit code on mount attempt

Browse source
This commit is contained in:
hellekin 2014-12-27 08:13:15 -03:00
parent 45c5b53cc4
commit 1068033e93
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tomb
View file

@ -1753,9 +1753,24 @@ mount_tomb() {
sudo mkdir -p $tombmount
# Default mount options are overridden with the -o switch
{ option_is_set -o } && MOUNTOPTS="$(option_value -o)"
{ option_is_set -o } && {
local oldmountopts=$MOUNTOPTS
MOUNTOPTS="$(option_value -o)" }
# TODO: safety check MOUNTOPTS
# safe_mount_options && \
sudo mount -o $MOUNTOPTS /dev/mapper/${mapper} ${tombmount}
# Clean up if the mount failed
[[ $? == 0 ]] || {
_warning "Error mounting ::1 mapper:: on ::2 tombmount::" $mapper $tombmount
[[ $oldmountopts != $MOUNTOPTS ]] && \
_warning "Are mount options '::1 mount options::' valid?" $MOUNTOPTS
# TODO: move cleanup to _endgame()
[[ -d $tombmount ]] && rmdir $tombmount
[[ -e /dev/mapper/$mapper ]] && sudo cryptsetup luksClose $mapper
# The loop is taken care of in _endgame()
_failure "Cannot mount ::1 tomb name::" $TOMBNAME
}
sudo chown $UID:$GID ${tombmount}
sudo chmod 0711 ${tombmount}