Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-05 21:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

more fixes to the usbkey detection

Browse Source
This commit is contained in:
Jaromil 2011-01-11 14:55:31 +01:00
parent b669a11ff4
commit 49e6d09eae
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/tomb
View File

@ -50,8 +50,8 @@ fi
# usb auto detect # usb auto detect
# tested on ubuntu 10.04 - please test and patch on other systems if you can # tested on ubuntu 10.04 - please test and patch on other systems if you can
ask_usbkey() { ask_usbkey() {
echo "looking for key $1 on usb" notice "looking for key $1 on usb"
echo -n "please insert your usb key " echo -n " . please insert your usb key "
plugged=false plugged=false
while [ "$plugged" != "true" ]; do while [ "$plugged" != "true" ]; do
@ -62,7 +62,7 @@ ask_usbkey() {
done done
echo echo
echo -n "usb key inserted, attaching " echo -n " . usb key inserted, opening "
attached=false attached=false
while [ "$attached" != "true" ]; do while [ "$attached" != "true" ]; do
@ -75,8 +75,7 @@ ask_usbkey() {
# get the first partition # get the first partition
usbpart=`dmesg |tail -n 8 | grep ' sd.:' |cut -d: -f2` usbpart=`dmesg |tail -n 8 | grep ' sd.:' |cut -d: -f2`
usbpart=`expr substr $usbpart 1 4` usbpart=`expr substr $usbpart 1 4`
echo
echo -n "usb key attached, mounting $usbpart "
# what that it is mounted # what that it is mounted
mounted=false mounted=false
while [ "$mounted" != "true" ]; do while [ "$mounted" != "true" ]; do
@ -89,8 +88,8 @@ ask_usbkey() {
# check where it is mounted # check where it is mounted
usbmount=`cat /proc/mounts | awk -v p=$usbpart '{ if( $1 == "/dev/" p) print $2 }'` usbmount=`cat /proc/mounts | awk -v p=$usbpart '{ if( $1 == "/dev/" p) print $2 }'`
echo echo
echo "usb key mounted on $usbmount" act "usb key mounted on $usbmount"
export usbkey_mount export usbkey_mount=$usbmount
return 0 return 0
} }
@ -127,7 +126,7 @@ ask_password() {
### ###
notice "Tomb - simple commandline tool for encrypted storage" notice "Tomb - simple commandline tool for encrypted storage"
act "version $VERSION ($DATE) by Denis J. Roio <jaromil@dyne.org>" act "version $VERSION ($DATE) by Jaromil @ dyne.org"
act "" act ""
func "invoked with args \"$*\" " func "invoked with args \"$*\" "
func "running on `date`" func "running on `date`"
@ -262,7 +261,7 @@ create_tomb() {
else else
mkdir -p ${usbkey_mount}/.tomb mkdir -p ${usbkey_mount}/.tomb
cp -v ${FILE}.gpg ${usbkey_mount}/.tomb/ cp -v ${FILE}.gpg ${usbkey_mount}/.tomb/
chown -R go-rwx ${usbkey_mount}/.tomb chmod -R go-rwx ${usbkey_mount}/.tomb
rm -rf ${FILE}.gpg rm -rf ${FILE}.gpg
fi fi
@ -328,7 +327,8 @@ mount_tomb() {
ask_usbkey ask_usbkey
# returns usbkey_mount, now check if the key is there # returns usbkey_mount, now check if the key is there
if [ -r ${usbkey_mount}/.tomb/${enc_key} ]; then if [ -r ${usbkey_mount}/.tomb/${enc_key} ]; then
notice "key found on ${usbkey_mount}/.tomb/${enc_key}" enc_key=${usbkey_mount}/.tomb/${enc_key}
notice "key found on ${enc_key}"
else else
error "key is missing." error "key is missing."
exit 1 exit 1