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

Use spaces instead of tabs.

Browse Source
This commit is contained in:
Daniel "GDrooid" Rodriguez 2015-01-09 17:33:07 +01:00
parent bd7300aa3e
commit 30669bb9fa
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tomb
View File

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