projects
/
grml-crypt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e6203b
)
Replace optimize* with optimise*
author
Michael Prokop
<mika@grml.org>
Thu, 26 Jul 2007 17:58:31 +0000
(19:58 +0200)
committer
Michael Prokop
<mika@grml.org>
Thu, 26 Jul 2007 17:58:31 +0000
(19:58 +0200)
debian/changelog
patch
|
blob
|
history
grml-crypt
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
ca2f7de
..
db94e8d
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,3
+1,10
@@
+grml-crypt (0.16) unstable; urgency=low
+
+ * Replace optimize* with optimise*, thanks for the hint
+ Thorsten Glaser.
+
+ -- Michael Prokop <mika@grml.org> Thu, 26 Jul 2007 19:57:32 +0200
+
grml-crypt (0.15) unstable; urgency=low
* Added compiled doku to the .tar.gz package
grml-crypt (0.15) unstable; urgency=low
* Added compiled doku to the .tar.gz package
diff --git
a/grml-crypt
b/grml-crypt
index
03d7d1f
..
40f95ea
100755
(executable)
--- a/
grml-crypt
+++ b/
grml-crypt
@@
-4,7
+4,7
@@
# Authors: Michael Gebetsroither <gebi@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
# Authors: Michael Gebetsroither <gebi@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change:
Mon Aug 08 11:37:20 CEST 2005
+# Latest change:
Don Jul 26 19:57:28 CEST 2007 [mika]
################################################################################
################################################################################
@@
-62,7
+62,7
@@
OPTIONS:
-t type of filesystem (default=$FSTYPE_)
-r read only mode (fully supported only by start)
-z insecure mode, using /dev/zero for most of the initialisation (INSECURE!)
-t type of filesystem (default=$FSTYPE_)
-r read only mode (fully supported only by start)
-z insecure mode, using /dev/zero for most of the initialisation (INSECURE!)
- -o optimi
z
ed initialisation mode (should be as secure as the default but faster)
+ -o optimi
s
ed 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
-m additional arguments to mount
-y verifies the passphrase by asking for it twice
-f force file overwriting in format mode and/or disable confirmation dialog
-m additional arguments to mount
@@
-100,7
+100,7
@@
EOT
function getDMName
{
device_="${1##*/}"
function getDMName
{
device_="${1##*/}"
-
+
# first trying normal devicename
tmp_="${DM_PREFIX_}${device_}"
if [ ! -e "$tmp_" ]; then
# first trying normal devicename
tmp_="${DM_PREFIX_}${device_}"
if [ ! -e "$tmp_" ]; then
@@
-131,10
+131,10
@@
function formatDevice
execute "$CRYPTSETUP_ luksOpen $TARGET_ $DM_NAME_" warn \
"could not open $DM_PATH_ to create a filesystem on it!" || return 1
if [[ $type_ == 'init' && $OPTIMIZED_MODE_SET_ == 'true' ]]; then
execute "$CRYPTSETUP_ luksOpen $TARGET_ $DM_NAME_" warn \
"could not open $DM_PATH_ to create a filesystem on it!" || return 1
if [[ $type_ == 'init' && $OPTIMIZED_MODE_SET_ == 'true' ]]; then
- echo "finishing optimi
z
ed initialisation (this could take some time)"
+ echo "finishing optimi
s
ed initialisation (this could take some time)"
# FIXME
execute "dd if=/dev/zero of=$DM_PATH_ bs=1M &>/dev/null" # || \
# FIXME
execute "dd if=/dev/zero of=$DM_PATH_ bs=1M &>/dev/null" # || \
- # warn "could not finish optimi
z
ed initialisation properly"
+ # warn "could not finish optimi
s
ed initialisation properly"
ret_=$?
# cutted out because of no space left on device error :(
#if [[ $ret_ != 0 ]]; then
ret_=$?
# cutted out because of no space left on device error :(
#if [[ $ret_ != 0 ]]; then
@@
-152,13
+152,13
@@
function formatDevice
echo "Successully created $FSTYPE_ on encrypted $TARGET_"
return 0
fi
echo "Successully created $FSTYPE_ on encrypted $TARGET_"
return 0
fi
-}
+}
function actionStart
{
ret_=0
function actionStart
{
ret_=0
-
+
# no mountpoint, by-by
if [[ "$MOUNT_POINT_" == "" ]]; then
printUsage
# no mountpoint, by-by
if [[ "$MOUNT_POINT_" == "" ]]; then
printUsage
@@
-198,12
+198,12
@@
function actionStop
isExistent "$mp_" die
tmp_=`realpath $mp_` || die "could not get realpath of $mp_"
dprint "realpath_=\"$tmp_\""
isExistent "$mp_" die
tmp_=`realpath $mp_` || die "could not get realpath of $mp_"
dprint "realpath_=\"$tmp_\""
-
+
dm_path_=`mount |grep "$tmp_ "` || die "$tmp_ is not mounted"
dprint "dm_path_=\"$dm_path_\""
dm_path_=`echo $dm_path_ |awk '{print $1}'` || die "could not get devicemapper name for $tmp_"
dprint "dm_path_=\"$dm_path_\""
dm_path_=`mount |grep "$tmp_ "` || die "$tmp_ is not mounted"
dprint "dm_path_=\"$dm_path_\""
dm_path_=`echo $dm_path_ |awk '{print $1}'` || die "could not get devicemapper name for $tmp_"
dprint "dm_path_=\"$dm_path_\""
-
+
dm_name_="${dm_path_##*/}"
dprint "dm_name_=\"$dm_name_\""
dm_name_="${dm_path_##*/}"
dprint "dm_name_=\"$dm_name_\""
@@
-211,7
+211,7
@@
function actionStop
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_\""
-
+
execute "umount $dm_path_" die "could not unmount $device_"
execute "$CRYPTSETUP_ luksClose $dm_name_" die "could not close $dm_path_"
echo "$device_" |grep loop &>/dev/null && execute "losetup -d $device_" \
execute "umount $dm_path_" die "could not unmount $device_"
execute "$CRYPTSETUP_ luksClose $dm_name_" die "could not close $dm_path_"
echo "$device_" |grep loop &>/dev/null && execute "losetup -d $device_" \
@@
-224,7
+224,7
@@
this device could possible not be a loop device => maybe bogus error"
function yesDialog
{
msg_="$1"
function yesDialog
{
msg_="$1"
-
+
echo "WARNING!" >&2
echo "========" >&2
echo -n "$msg_" >&2
echo "WARNING!" >&2
echo "========" >&2
echo -n "$msg_" >&2
@@
-258,7
+258,7
@@
function actionFormat
else
echo -n "Initialising file with "
if [[ $OPTIMIZED_MODE_SET_ == 'true' ]]; then
else
echo -n "Initialising file with "
if [[ $OPTIMIZED_MODE_SET_ == 'true' ]]; then
- echo "optimi
z
ed SECURE mode"
+ echo "optimi
s
ed SECURE mode"
execute "dd if=/dev/zero of=$TARGET_ bs=1M count=${SIZE_} &>/dev/null" \
die "could not initialise $TARGET_ with /dev/zero"
else
execute "dd if=/dev/zero of=$TARGET_ bs=1M count=${SIZE_} &>/dev/null" \
die "could not initialise $TARGET_ with /dev/zero"
else