# HG changeset patch # User ft # Date 1400665142 -7200 # Node ID 21d27339c8115660f30960307365f34a40175609 # Parent da49f2de14ae10ac6eb027dab3f5bb403528bc7b changed from device to filebased diff -r da49f2de14ae -r 21d27339c811 src/encryptionprovider.py --- a/src/encryptionprovider.py Thu May 15 10:16:06 2014 +0200 +++ b/src/encryptionprovider.py Wed May 21 11:39:02 2014 +0200 @@ -14,7 +14,7 @@ MINOPTS = { "Main" : ["LogFile", "LogLevel", "MountScript", "UmountScript", "InitScript", "GetDevicesScript", "Keyfile"]} -#CONFIG_FILE="/etc/enryptionprovider/encryptionprovider.cfg" +#CONFIG_FILE="/etc/encryptionprovider/encryptionprovider.cfg" CONFIG_FILE="/home/spawn/workspace_python/encryptionprovider/config/encryptionprovider.cfg" CONFIG_NOT_READABLE = "Configfile is not readable" CONFIG_WRONG = "Something is wrong with the config" @@ -139,9 +139,9 @@ parser = argparse.ArgumentParser(epilog='--mount, --umount and --initialize are mutually exclusive') group = parser.add_mutually_exclusive_group(required=True) - group.add_argument('-m', '--mount', action='store', nargs=4, dest='mount', help='Mounts an encrypted device.', metavar=("interface", "port", "device", "mountpoint")) - group.add_argument('-u', '--umount', action='store', nargs=1, dest='umount', help='Unmounts an encrypted device', metavar="device") - group.add_argument('-i', '--initialize', action='store', nargs=4, dest='initialize', help='Initialize an device.', metavar=("interface", "port", "device", "mountpoint")) + group.add_argument('-m', '--mount', action='store', nargs=4, dest='mount', help='Mounts an encrypted device.', metavar=("interface", "port", "tcfile", "mountpoint")) + group.add_argument('-u', '--umount', action='store', nargs=1, dest='umount', help='Unmounts an encrypted device', metavar="tcfile") + group.add_argument('-i', '--initialize', action='store', nargs=4, dest='initialize', help='Initialize an device.', metavar=("interface", "port", "tcfile", "mountpoint")) group.add_argument('-g', '--getdevices', action='store_true', dest="getdevices", help='Returns a list of all mounted encrypted devices') arguments = parser.parse_args()