X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-crypt;h=6a4cd703be14951134112708ff7e7eaa549f7eab;hb=d3e5faee12695000dc06bac50cd4f8b820bc9727;hp=5bcd12e002b2d00426b7625388270835dbba6ed0;hpb=fd577270569c91d9d98ce950264d5df2915292d5;p=grml-crypt.git

diff --git a/grml-crypt b/grml-crypt
index 5bcd12e..6a4cd70 100755
--- a/grml-crypt
+++ b/grml-crypt
@@ -171,7 +171,7 @@ function actionStart
   ret_=0
 
   if [[ "$MOUNT_POINT_" == "" ]]; then
-    MOUNT_POINT_="/mnt/$DM_NAME_"
+    MOUNT_POINT_="/media/$DM_NAME_"
   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_"
-  if [[ "$MOUNT_POINT_" == "/mnt/$dm_name_" ]]; then
+  if [[ "$MOUNT_POINT_" == "/media/$dm_name_" ]]; then
     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"
 
-MKFS_="/sbin/mkfs.$FSTYPE_"
-if [ ! -x "$MKFS_" ]; then
+MKFS_="`which mkfs.$FSTYPE_`"
+if [ $? != "0" ]; then
   die "invalid filesystem type \"$FSTYPE_\"" 1
 fi