diff -r 60bc07f3f415 -r ee0797f46473 usbmount/mount.d/00_create_model_symlink --- a/usbmount/mount.d/00_create_model_symlink Thu Feb 27 17:12:59 2014 +0100 +++ b/usbmount/mount.d/00_create_model_symlink Tue Nov 04 14:58:00 2014 +0100 @@ -13,6 +13,23 @@ # set -e +log() +{ + if [ $1 != debug ] || expr "$VERBOSE" : "[yY]" > /dev/null; then + logger -p user.$1 -t "usbmount[$$]" -- "$2" + fi +} + +getRemoteIp () +{ + ip_address=$(ifconfig eth0 | grep "inet " | awk '{ print $2 }' | cut -d ":" -f 2) + ip_netmask=$(ifconfig eth0 | grep "inet " | awk '{ print $4 }' | cut -d ":" -f 2) + remote_ip=$(ipcalc $ip_address/$ip_netmask | grep HostMin | awk '{ print $2}') + + echo $remote_ip +} + + # Replace spaces with underscores, remove special characters in vendor # and model name. UM_VENDOR=`echo "$UM_VENDOR" | sed 's/ /_/g; s/[^0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._-]//g'` @@ -34,8 +51,37 @@ name="${name}_$partition" fi -mkdir -p "/var/run/usbmount/$name" -osecfs /etc/osecfs/osecfs_usb.cfg /var/run/usbmount/$name ro +set +e +#if [ -f "/media/usb0/opensecurity.tc" ] +#then +# log info "Found Truecrypt file on Stick. Try to mount" +# wget -q -T 3 -t 1 -O /dev/null http://$(getRemoteIp):8090/password?text=Please+enter+the+password +# if [ "$?" != "0" ] +# then +# log err "ERROR: Connection to http://$(getRemoteIp):8090/password?text=Please+enter+the+password failed" +# exit 1 +# fi +# +# log info "Password notification sended, wait for response" +# mkdir -p "/media/encrypted" +# /usr/bin/encryptionprovider.py -m eth0 58080 /media/usb0/opensecurity.tc /media/encrypted +# if [ "$?" != "0" ] +# then +# log err "Stick removed. exit" +# exit 1 +# fi +# mkdir -p "/var/run/usbmount/encrypted" +# /usr/bin/osecfs /etc/osecfs/osecfs_usb.cfg "/var/run/usbmount/encrypted" rw +# log info "Encrypted stick mounted" +#else +# mkdir -p "/var/run/usbmount/$name" + chattr -i "/tmp/usbmount" + mkdir -p "/tmp/usbmount/$name" + osecfs /etc/osecfs/osecfs_usb.cfg /tmp/usbmount/$name ro + encryptionprovider.py -i eth0 58081 "$UM_DEVICE" /media/usb0 & + chattr +i "/tmp/usbmount" + #run_initlistener.sh $UM_DEVICE & +#fi exit 0