1.1 --- a/src/encryptionprovider.py	Fri Jun 06 11:57:40 2014 +0200
     1.2 +++ b/src/encryptionprovider.py	Mon Aug 18 16:08:34 2014 +0200
     1.3 @@ -61,7 +61,7 @@
     1.4                          filename = logfile,
     1.5                          filemode = "a+",
     1.6      )
     1.7 -    LOG = logging.getLogger("fuse_main")
     1.8 +    LOG = logging.getLogger("encryptionprovicer")
     1.9      
    1.10      
    1.11      
    1.12 @@ -147,8 +147,8 @@
    1.13          return False
    1.14      
    1.15  
    1.16 -def initDevice (script, interface, port, device, mountpoint, keyfilepath):    
    1.17 -    listener = MyRestListener (opensecurity_urls, globals(), script = script, device = device, mountpoint = mountpoint, tries = 3, keyfilepath = keyfilepath)
    1.18 +def initDevice (script, interface, port, device, mountpoint, keyfilepath, preinitscript, postinitscript):    
    1.19 +    listener = MyRestListener (opensecurity_urls, globals(), script = script, device = device, mountpoint = mountpoint, tries = 3, keyfilepath = keyfilepath, preinitscript = preinitscript, postinitscript = postinitscript)
    1.20      thread.start_new_thread(listener.run, (interface, port,))
    1.21      
    1.22      close = False
    1.23 @@ -158,11 +158,6 @@
    1.24              close = True
    1.25              LOG.info ("Stick \"%s\" removed -> exit" %(device,))
    1.26              sys.exit(1)
    1.27 -            
    1.28 -        if ((os.path.ismount(mountpoint) == True) and (isDeviceMountedAtMountpoint(device, mountpoint) == False)):
    1.29 -            close = True
    1.30 -            LOG.info ("Stick \"%s\" init finished -> exit" %(device,))
    1.31 -            sys.exit(0)
    1.32  
    1.33  if __name__ == "__main__":
    1.34      
    1.35 @@ -188,4 +183,4 @@
    1.36          mountDevice (config.get ("Main", "MountScript"), arguments.mount[0], int(arguments.mount[1]), arguments.mount[2], arguments.mount[3], config.get ("Main", "Keyfile"))
    1.37      
    1.38      if (arguments.initialize):
    1.39 -        initDevice (config.get ("Main", "InitScript"), arguments.initialize[0], int(arguments.initialize[1]), arguments.initialize[2], arguments.initialize[3], config.get ("Main", "Keyfile"))
    1.40 +        initDevice (config.get ("Main", "InitScript"), arguments.initialize[0], int(arguments.initialize[1]), arguments.initialize[2], arguments.initialize[3], config.get ("Main", "Keyfile"), config.get("Main", "PreInitScript"), config.get("Main", "PostInitScript"))