mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2025-04-06 00:37:06 +00:00
Simplify ehdd mount/umount code
This commit is contained in:
parent
8838d5af82
commit
9eacf3fe3f
@ -24,3 +24,18 @@ keyfile_option() {
|
|||||||
echo "--key-file $EHDD_KEYFILE"
|
echo "--key-file $EHDD_KEYFILE"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
hdd_exists() {
|
||||||
|
[ -e "$EHDD_IMG" ] && return 0
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
is_mounted() {
|
||||||
|
[ ! -e "$EHDD_IMG" ] && return 1
|
||||||
|
if mount | grep "^/dev/mapper/$EHDD_LUKS_NAME on $EHDD_MOUNTPOINT" >/dev/null; then
|
||||||
|
# mounted
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
@ -7,7 +7,7 @@ if [ ! -e "$EHDD_IMG" ]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if mount | grep "^/dev/mapper/$EHDD_LUKS_NAME on $EHDD_MOUNTPOINT" >/dev/null; then
|
if is_mounted; then
|
||||||
echo "$EHDD_IMG already mounted"
|
echo "$EHDD_IMG already mounted"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
. "ehdd/ehdd_funcs.sh" || exit 1
|
. "ehdd/ehdd_funcs.sh" || exit 1
|
||||||
|
|
||||||
if ! mount | grep "$EHDD_MOUNTPOINT" >/dev/null; then
|
|
||||||
|
if ! is_mounted; then
|
||||||
# not mounted
|
# not mounted
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user