Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2025-04-06 01:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

indentation and small fix for umount to avoid warnings and correct check

Browse Source
This commit is contained in:
Jaromil 2014-11-14 14:25:49 +01:00
parent d53727c6ee
commit 9097a69631
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tomb
View File

@ -2231,12 +2231,12 @@ umount_tomb() {
fi fi
[[ ${#mounted_tombs} == 0 ]] && { [[ ${#mounted_tombs} == 0 ]] && {
_failure "There is no open tomb to be closed." } _failure "There is no open tomb to be closed." }
[[ ${#mounted_tombs} -gt 1 && -z "$1" ]] && { [[ ${#mounted_tombs} -gt 1 && -z "$1" ]] && {
_warning "Too many tombs mounted, please specify one (see tomb list)" _warning "Too many tombs mounted, please specify one (see tomb list)"
_warning "or issue the command 'tomb close all' to close them all." _warning "or issue the command 'tomb close all' to close them all."
_failure "Operation aborted." } _failure "Operation aborted." }
_message "Tomb close ::1::" $1 _message "Tomb close ::1::" $1
@ -2259,15 +2259,15 @@ umount_tomb() {
[[ -n $SLAM ]] && { [[ -n $SLAM ]] && {
_success "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::" \ _success "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::" \
$tombname $tombmount $tombname $tombmount
_message "Kill all processes busy inside the tomb." _message "Kill all processes busy inside the tomb."
{ slam_tomb "$tombmount" } || { { slam_tomb "$tombmount" } || {
_failure "Cannot slam the tomb ::1 tomb name::" $tombname } _failure "Cannot slam the tomb ::1 tomb name::" $tombname }
} || { } || {
_message "Closing tomb ::1 tomb name:: mounted on ::2 mount point::" \ _message "Closing tomb ::1 tomb name:: mounted on ::2 mount point::" \
$tombname $tombmount } $tombname $tombmount }
# check if there are binded dirs and close them # check if there are binded dirs and close them
bind_tombs=(`list_tomb_binds $tombname`) bind_tombs=(`list_tomb_binds $tombname`)
for b in ${bind_tombs}; do for b in ${bind_tombs}; do
bind_mapper="${b[(ws:;:)1]}" bind_mapper="${b[(ws:;:)1]}"
@ -2280,29 +2280,30 @@ umount_tomb() {
[[ $? == 1 ]] && { [[ $? == 1 ]] && {
_failure "Cannot slam the bind hook ::1 hook::" $bind_mount } _failure "Cannot slam the bind hook ::1 hook::" $bind_mount }
umount $bind_mount umount $bind_mount
} || { } || {
_warning "Tomb bind hook ::1 hook:: is busy, cannot close tomb." $bind_mount } _warning "Tomb bind hook ::1 hook:: is busy, cannot close tomb." $bind_mount }
} }
done done
# Execute post-hooks for eventual cleanup # Execute post-hooks for eventual cleanup
{ option_is_set -n } || { { option_is_set -n } || {
exec_safe_post_hooks ${tombmount%%/} close } exec_safe_post_hooks ${tombmount%%/} close }
_verbose "Performing umount of ::1 mount point::" $tombmount _verbose "Performing umount of ::1 mount point::" $tombmount
umount ${tombmount} && { umount ${tombmount}
# We used a default mountpoint [[ $? = 0 ]] || { _warning "Tomb is busy, cannot umount!"; return 1 }
[[ "$tombmount" == "/media/$tombname.tomb" ]] && {
rmdir $tombmount } # If we used a default mountpoint and is now empty, delete it
} || { _warning "Tomb is busy, cannot umount!" } [[ "$tombmount" == "/media/$tombname.tomb" ]] && { rmdir $tombmount }
cryptsetup luksClose $mapper cryptsetup luksClose $mapper
[[ $? == 0 ]] || { [[ $? == 0 ]] || {
_failure "Error occurred in cryptsetup luksClose ::1 mapper::" $mapper } _failure "Error occurred in cryptsetup luksClose ::1 mapper::" $mapper }
# Normally the loopback device is detached when unused # Normally the loopback device is detached when unused
[[ -e "/dev/$tombloop" ]] && losetup -d "/dev/$tombloop" || { [[ -e "/dev/$tombloop" ]] && losetup -d "/dev/$tombloop"
_verbose "/dev/$tombloop was already closed." } [[ $? = 0 ]] || {
_verbose "/dev/$tombloop was already closed." }
_success "Tomb ::1 tomb name:: closed: your bones will rest in peace." $tombname _success "Tomb ::1 tomb name:: closed: your bones will rest in peace." $tombname