# HG changeset patch # User ft # Date 1406554030 -7200 # Node ID f6fc3ab7f0c9942eb895faf883d79c8e810ea5c5 # Parent 4762c3abc17a0f4cb8e3679cbb30f0623972e829 added init_manager added run_initlistener diff -r 4762c3abc17a -r f6fc3ab7f0c9 management_scripts/init_manager.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/management_scripts/init_manager.sh Mon Jul 28 15:27:10 2014 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh + +DEVICE="$1" + +# This script makes sure that the stick is unmounted and unused +# Run this Script before the init process + +# make sure the device is not mounted +umount /var/run/usbmount/* +rmdir /var/run/usbmount/* +sleep 1 +umount ${DEVICE}* + +# search for already encrypted volumes +device=$(encryptionprovider.py -g) + +if [ "$?" == "0" ] +then + encryptionprovider.py -u $device +fi \ No newline at end of file diff -r 4762c3abc17a -r f6fc3ab7f0c9 management_scripts/run_initlistener.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/management_scripts/run_initlistener.sh Mon Jul 28 15:27:10 2014 +0200 @@ -0,0 +1,16 @@ +#!/bin/sh + +DEVICE="$1" + +encryptionprovider.py -i eth0 58081 "$DEVICE" /media/usb0 +if [ "$?" != "0" ] +then + # this will happen if the stick was removed + exit 0 +fi + +mkdir /var/run/usbmount/encrypted +/usr/bin/osecfs /etc/osecfs/osecfs_usb.cfg "/var/run/usbmount/encrypted" rw + +# now stick is encrypted and mounted. Rerun Script +$0 $DEVICE \ No newline at end of file diff -r 4762c3abc17a -r f6fc3ab7f0c9 truecrypt_scripts/truecrypt_init.sh --- a/truecrypt_scripts/truecrypt_init.sh Tue Jun 10 09:22:20 2014 +0200 +++ b/truecrypt_scripts/truecrypt_init.sh Mon Jul 28 15:27:10 2014 +0200 @@ -15,13 +15,11 @@ fi # make sure to have "/dev/sdb" (not "/dev/sdb1") -#DEVICE="${DEVICE:0:8}" the bash way does not word in dash -.- +#DEVICE="${DEVICE:0:8}" the bash way does not work in dash -.- DEVICE="$(echo "$DEVICE" | awk '{print substr($1,0,9)}')" -# make sure the device is not mounted -umount /var/run/usbmount/* -sleep 1 -umount ${DEVICE}* +# make sure the device is not mounted (always run the init_manger script here!) +init_manager.sh "$DEVICE" if [ -z "$KEYFILE" ]