@ -45,7 +45,6 @@ class CryptoBoxContainer:
self . device = device
self . cbox = cbox
self . log = logging . getLogger ( " CryptoBox " )
self . Progs = self . cbox . prefs [ " Programs " ]
self . resetObject ( )
@ -157,8 +156,8 @@ class CryptoBoxContainer:
stdout = subprocess . PIPE ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " super " ] ,
self . Progs[ " CryptoBoxRootActions " ] ,
self . cbox. prefs [ " Program s" ] [ " super " ] ,
self . cbox. prefs [ " Program s" ] [ " CryptoBoxRootActions " ] ,
" cryptsetup " ,
" luksAddKey " ,
self . device ,
@ -182,7 +181,7 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " cryptsetup " ] ,
self . cbox. prefs [ " Program s" ] [ " cryptsetup " ] ,
" --batch-mode " ,
" luksDelKey " ,
self . device ,
@ -228,7 +227,7 @@ class CryptoBoxContainer:
stdin = None ,
stdout = subprocess . PIPE ,
stderr = subprocess . PIPE ,
args = [ self . Progs[ " blkid " ] ,
args = [ self . cbox. prefs [ " Program s" ] [ " blkid " ] ,
" -s " , " UUID " ,
" -o " , " value " ,
" -c " , os . devnull ,
@ -267,7 +266,7 @@ class CryptoBoxContainer:
stdin = None ,
stdout = subprocess . PIPE ,
stderr = subprocess . PIPE ,
args = [ self . Progs[ " blkid " ] ,
args = [ self . cbox. prefs [ " Program s" ] [ " blkid " ] ,
" -s " , " TYPE " ,
" -o " , " value " ,
" -c " , os . devnull ,
@ -295,7 +294,7 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = devnull ,
args = [
self . Progs[ " cryptsetup " ] ,
self . cbox. prefs [ " Program s" ] [ " cryptsetup " ] ,
" --batch-mode " ,
" isLuks " ,
self . device ] )
@ -332,8 +331,8 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " super " ] ,
self . Progs[ " CryptoBoxRootActions " ] ,
self . cbox. prefs [ " Program s" ] [ " super " ] ,
self . cbox. prefs [ " Program s" ] [ " CryptoBoxRootActions " ] ,
" cryptsetup " ,
" luksOpen " ,
self . device ,
@ -351,8 +350,8 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " super " ] ,
self . Progs[ " CryptoBoxRootActions " ] ,
self . cbox. prefs [ " Program s" ] [ " super " ] ,
self . cbox. prefs [ " Program s" ] [ " CryptoBoxRootActions " ] ,
" mount " ,
os . path . join ( self . __dmDir , self . name ) ,
self . __getMountPoint ( ) ] )
@ -378,8 +377,8 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " super " ] ,
self . Progs[ " CryptoBoxRootActions " ] ,
self . cbox. prefs [ " Program s" ] [ " super " ] ,
self . cbox. prefs [ " Program s" ] [ " CryptoBoxRootActions " ] ,
" umount " ,
self . __getMountPoint ( ) ] )
proc . wait ( )
@ -394,8 +393,8 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " super " ] ,
self . Progs[ " CryptoBoxRootActions " ] ,
self . cbox. prefs [ " Program s" ] [ " super " ] ,
self . cbox. prefs [ " Program s" ] [ " CryptoBoxRootActions " ] ,
" cryptsetup " ,
" luksClose " ,
self . name ,
@ -429,8 +428,8 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " super " ] ,
self . Progs[ " CryptoBoxRootActions " ] ,
self . cbox. prefs [ " Program s" ] [ " super " ] ,
self . cbox. prefs [ " Program s" ] [ " CryptoBoxRootActions " ] ,
" mount " ,
self . device ,
self . __getMountPoint ( ) ] )
@ -456,8 +455,8 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " super " ] ,
self . Progs[ " CryptoBoxRootActions " ] ,
self . cbox. prefs [ " Program s" ] [ " super " ] ,
self . cbox. prefs [ " Program s" ] [ " CryptoBoxRootActions " ] ,
" umount " ,
self . __getMountPoint ( ) ] )
proc . wait ( )
@ -483,7 +482,7 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " mkfs-data " ] ,
self . cbox. prefs [ " Program s" ] [ " mkfs-data " ] ,
self . device ] )
proc . wait ( )
if proc . returncode != 0 :
@ -513,8 +512,8 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " super " ] ,
self . Progs[ " CryptoBoxRootActions " ] ,
self . cbox. prefs [ " Program s" ] [ " super " ] ,
self . cbox. prefs [ " Program s" ] [ " CryptoBoxRootActions " ] ,
" cryptsetup " ,
" luksFormat " ,
self . device ,
@ -534,8 +533,8 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " super " ] ,
self . Progs[ " CryptoBoxRootActions " ] ,
self . cbox. prefs [ " Program s" ] [ " super " ] ,
self . cbox. prefs [ " Program s" ] [ " CryptoBoxRootActions " ] ,
" cryptsetup " ,
" luksOpen " ,
self . device ,
@ -554,7 +553,7 @@ class CryptoBoxContainer:
stdout = devnull ,
stderr = subprocess . PIPE ,
args = [
self . Progs[ " mkfs-data " ] ,
self . cbox. prefs [ " Program s" ] [ " mkfs-data " ] ,
os . path . join ( self . __dmDir , self . name ) ] )
proc . wait ( )
" remove the mapping - for every exit status "