projects
/
grml-crypt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.25
[grml-crypt.git]
/
grml-crypt
diff --git
a/grml-crypt
b/grml-crypt
index
5bcd12e
..
6a4cd70
100755
(executable)
--- a/
grml-crypt
+++ b/
grml-crypt
@@
-171,7
+171,7
@@
function actionStart
ret_=0
if [[ "$MOUNT_POINT_" == "" ]]; then
ret_=0
if [[ "$MOUNT_POINT_" == "" ]]; then
- MOUNT_POINT_="/m
nt
/$DM_NAME_"
+ MOUNT_POINT_="/m
edia
/$DM_NAME_"
else
# error out if mountpoint was given but doesn't exist
if [ ! -d "$MOUNT_POINT_" ]; then
else
# error out if mountpoint was given but doesn't exist
if [ ! -d "$MOUNT_POINT_" ]; then
@@
-249,7
+249,7
@@
function actionStop
dprint "device_=\"$device_\""
execute "umount $dm_path_" die "could not unmount $device_"
dprint "device_=\"$device_\""
execute "umount $dm_path_" die "could not unmount $device_"
- if [[ "$MOUNT_POINT_" == "/m
nt
/$dm_name_" ]]; then
+ if [[ "$MOUNT_POINT_" == "/m
edia
/$dm_name_" ]]; then
rmdir "$MOUNT_POINT_"
fi
execute "$CRYPTSETUP_ luksClose $dm_name_" die "could not close $dm_path_"
rmdir "$MOUNT_POINT_"
fi
execute "$CRYPTSETUP_ luksClose $dm_name_" die "could not close $dm_path_"
@@
-427,8
+427,8
@@
if (( $OPTIMIZING_LEVEL_ > 1 )); then
fi
TARGET_="$2"
fi
TARGET_="$2"
-MKFS_="
/sbin/mkfs.$FSTYPE_
"
-if [
! -x "$MKFS_
" ]; then
+MKFS_="
`which mkfs.$FSTYPE_`
"
+if [
$? != "0
" ]; then
die "invalid filesystem type \"$FSTYPE_\"" 1
fi
die "invalid filesystem type \"$FSTYPE_\"" 1
fi