begun unmount option

Author: owenson

examples/mount.py

@@ -31,13 +31,16 @@
 import getopt
 
 hidden = False
+unmount = False
 
 args = getopt.getopt(sys.argv[1:], "h")
 
 # parse cmdline options
 for k in args[0]:
 	if k[0]=='-h':
 		hidden = True
+#	if k[0]=='-u':
+#		unmount = True
 
 if len(args[1]) != 2:
 	print "Usage: python mount.py [-h] volumepath dmname"
@@ -53,6 +56,11 @@
 PASSWORD = getpass.getpass("Enter password: ")
 DMNAME = args[1][1]
 
+#if unmount:
+	#todo
+	# remove loopback
+#	os.system("losetup -d `sudo losetup -a | grep '%s' | cut -d ':' -f 1`" % (FILENAME))
+
 #initialise pytruecrypt
 tc = PyTruecrypt(FILENAME)
 
@@ -63,17 +71,20 @@
 
 #if root - mount it
 if os.getuid() == 0:
-	#find a free loopback device
-	child = Popen("losetup -f", shell=True, stdout=PIPE)
-	output, errors = child.communicate();
-	freeLoopback = output.strip()
-
-	#setup loopback
-	os.system("losetup %s %s" % (freeLoopback, FILENAME))
+	devName = FILENAME
+	
+	# if not block device - use loopback
+	if not stat.S_ISBLK(os.stat(devName).st_mode):
+		#find a free loopback device
+		child = Popen("losetup -f", shell=True, stdout=PIPE)
+		output, errors = child.communicate();
+		devName = output.strip()
+
+		#setup loopback
+		os.system("losetup %s %s" % (devName, FILENAME))
 
 	#setup linux device mapper so can mount volume
-	dmtable = tc.getDeviceMapperTable(freeLoopback)
-
+	dmtable = tc.getDeviceMapperTable(devName)
 
 	#create dm target /dev/mapper/tcrypt
 #	print "Device mapper table"

util.py

@@ -1,3 +1,21 @@
+# Truecrypt parsing library for Python by Gareth Owen
+# https://github.com/drgowen/pytruecrypt/
+# See LICENCE for licence details
+
+# PyTruecrypt is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# PyTruecrypt is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with PyTruecrypt.  If not, see <http://www.gnu.org/licenses/>.
+
+
 # hexdump print function
 def hexdump(src, length=16):
     FILTER = ''.join([(len(repr(chr(x))) == 3) and chr(x) or '.' for x in range(256)])