projects
/
grml-crypt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo fixes in a few messages.
[grml-crypt.git]
/
grml-crypt
diff --git
a/grml-crypt
b/grml-crypt
index
0aef76d
..
47ca333
100755
(executable)
--- a/
grml-crypt
+++ b/
grml-crypt
@@
-35,6
+35,7
@@
DM_PATH_=""
ACTION_=""
DM_PREFIX_="grml-crypt_"
FORCE_='false'
ACTION_=""
DM_PREFIX_="grml-crypt_"
FORCE_='false'
+FSCK_='false'
ENTROPY_SOURCE_='/dev/urandom'
OPTIMIZED_MODE_SET_='false'
OPTIMIZING_LEVEL_=0
ENTROPY_SOURCE_='/dev/urandom'
OPTIMIZED_MODE_SET_='false'
OPTIMIZING_LEVEL_=0
@@
-65,6
+66,7
@@
OPTIONS:
-o optimised initialisation mode (should be as secure as the default but faster)
-y verifies the passphrase by asking for it twice
-f force file overwriting in format mode and/or disable confirmation dialog
-o optimised initialisation mode (should be as secure as the default but faster)
-y verifies the passphrase by asking for it twice
-f force file overwriting in format mode and/or disable confirmation dialog
+ -F only for action start: run fsck before mounting the filesystem. Use fsck's -f option if given twice.
-m additional arguments to mount
-v verbose (show what is going on, v++)
-h this help text
-m additional arguments to mount
-v verbose (show what is going on, v++)
-h this help text
@@
-184,6
+186,11
@@
function actionStart
$READONLY_SET_ && cargs_='--readonly'
execute "$CRYPTSETUP_ $cargs_ luksOpen $TARGET_ $DM_NAME_" warn || execute "losetup -d $TARGET_" || \
die "could not luksOpen $TARGET_"
$READONLY_SET_ && cargs_='--readonly'
execute "$CRYPTSETUP_ $cargs_ luksOpen $TARGET_ $DM_NAME_" warn || execute "losetup -d $TARGET_" || \
die "could not luksOpen $TARGET_"
+ if [[ "$FSCK_" == "true" ]] ; then
+ execute "fsck -C $DM_PATH_" || die "fsck failed on $DM_PATH_"
+ elif [[ "$FSCK_" == "trueforce" ]] ; then
+ execute "fsck -f -C $DM_PATH_" || die "fsck failed on $DM_PATH_"
+ fi
margs_=""
$READONLY_SET_ && margs_='-r'
execute "mount $margs_ $ADDITIONAL_MOUNT_ARGS_ $DM_PATH_ $MOUNT_POINT_" die
margs_=""
$READONLY_SET_ && margs_='-r'
execute "mount $margs_ $ADDITIONAL_MOUNT_ARGS_ $DM_PATH_ $MOUNT_POINT_" die
@@
-207,7
+214,7
@@
function actionStop
dm_name_="${dm_path_##*/}"
dprint "dm_name_=\"$dm_name_\""
dm_name_="${dm_path_##*/}"
dprint "dm_name_=\"$dm_name_\""
- dmsetup info $dm_name_ >/dev/null ||die "$dm_name_ is not a
k
tive"
+ dmsetup info $dm_name_ >/dev/null ||die "$dm_name_ is not a
c
tive"
device_=`$CRYPTSETUP_ status $dm_name_ |awk '/device:/{print $2}'` || \
die "could not get underlying device of $dm_path_"
dprint "device_=\"$device_\""
device_=`$CRYPTSETUP_ status $dm_name_ |awk '/device:/{print $2}'` || \
die "could not get underlying device of $dm_path_"
dprint "device_=\"$device_\""
@@
-217,7
+224,7
@@
function actionStop
echo "$device_" |grep loop &>/dev/null && execute "losetup -d $device_" \
die "could not delete loop device $device_" || \
execute "losetup -d $device_ &>/dev/null" eprint "could not delete loop device $device_, \
echo "$device_" |grep loop &>/dev/null && execute "losetup -d $device_" \
die "could not delete loop device $device_" || \
execute "losetup -d $device_ &>/dev/null" eprint "could not delete loop device $device_, \
-this device
could possible not be
a loop device => maybe bogus error"
+this device
possibly is not
a loop device => maybe bogus error"
notice "$mp_ successfully unmountet/closed/deleted"
}
notice "$mp_ successfully unmountet/closed/deleted"
}
@@
-334,7
+341,7
@@
function actionFormat
### __MAIN
###
### __MAIN
###
-while getopts "s:t:rzoyfm:hvS:C:I:A:" opt; do
+while getopts "s:t:rzoyf
F
m:hvS:C:I:A:" opt; do
case "$opt" in
s) SIZE_="$OPTARG"; SIZE_SET_='true' ;;
t) FSTYPE_="$OPTARG" ;;
case "$opt" in
s) SIZE_="$OPTARG"; SIZE_SET_='true' ;;
t) FSTYPE_="$OPTARG" ;;
@@
-346,6
+353,12
@@
while getopts "s:t:rzoyfm:hvS:C:I:A:" opt; do
OPTIMIZED_MODE_SET_='true' ;;
y) VERIFY_PW_="--verify-passphrase" ;;
f) FORCE_='true' ;;
OPTIMIZED_MODE_SET_='true' ;;
y) VERIFY_PW_="--verify-passphrase" ;;
f) FORCE_='true' ;;
+ F) if [[ "$FSCK_" == "true" ]] ; then
+ FSCK_='trueforce'
+ else
+ FSCK_='true'
+ fi
+ ;;
m) ADDITIONAL_MOUNT_ARGS_="$OPTARG" ;;
h) printUsage; exit ;;
v) let verbose_=$verbose_+1 ;;
m) ADDITIONAL_MOUNT_ARGS_="$OPTARG" ;;
h) printUsage; exit ;;
v) let verbose_=$verbose_+1 ;;