2 changes to grml-crypt
Sorry for the mistake I made in my previous patch for grml-crypt. Using DM_NAME_ (fsck grml-crypt_sda1) won't work of course, I had to change it to DM_PATH_ (fsck /dev/mapper/grml-crypt_sda1). While fixing that, I introduced another addition to the -F option: If given twice, it will add "-f" to fsck's options, forcing a full fsck. So I'm sending two small patches :)
--- grml-crypt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/grml-crypt b/grml-crypt index fade32e..107fe7f 100755 --- a/grml-crypt +++ b/grml-crypt @@ -187,7 +187,7 @@ function actionStart 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_NAME_" || die "fsck failed on $DM_NAME_" + execute "fsck -C $DM_PATH_" || die "fsck failed on $DM_PATH_" fi margs_="" $READONLY_SET_ && margs_='-r'
--- grml-crypt | 11 +++++++++-- grml-crypt.8.txt | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/grml-crypt b/grml-crypt index 107fe7f..a205033 100755 --- a/grml-crypt +++ b/grml-crypt @@ -66,7 +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 - -F only for action start: run fsck before mounting the filesystem + -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 @@ -188,6 +188,8 @@ function actionStart 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' @@ -351,7 +353,12 @@ while getopts "s:t:rzoyfFm:hvS:C:I:A:" opt; do OPTIMIZED_MODE_SET_='true' ;; y) VERIFY_PW_="--verify-passphrase" ;; f) FORCE_='true' ;; - F) FSCK_='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 ;; diff --git a/grml-crypt.8.txt b/grml-crypt.8.txt index 07bb54e..1ff290d 100644 --- a/grml-crypt.8.txt +++ b/grml-crypt.8.txt @@ -82,7 +82,7 @@ Shows what is going on (more v => more out).
*-F*:: Only for action start: Run fsck on the filesystem before mounting it to - the given mountpoint. + the given mountpoint. If given twice, use fsck's -f option as well.
*-m*:: Additional arguments passed through to mount. Could be like "'-o noatime'".
* Thomas Koehler jean-luc@picard.franken.de [Mon Jun 07, 2010 at 08:31:59AM +0200]:
grml-crypt | 11 +++++++++-- grml-crypt.8.txt | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-)
[...]
JFTR: Both patches applied and pushed, uploaded new version grml-crypt 0.19.
thanks && regards, -mika-
Teilnehmer (2)
-
Michael Prokop -
Thomas Koehler