* cryptsetup demands running with uid=0 since v1.0.5
This commit is contained in:
parent
1f75580b95
commit
9fa6376672
|
@ -333,7 +333,10 @@ class Blockdevice:
|
||||||
shell = False,
|
shell = False,
|
||||||
stdout = subprocess.PIPE,
|
stdout = subprocess.PIPE,
|
||||||
stderr = subprocess.PIPE,
|
stderr = subprocess.PIPE,
|
||||||
args = [ prefs["Programs"]["cryptsetup"],
|
args = [
|
||||||
|
prefs["Programs"]["super"],
|
||||||
|
prefs["Programs"]["CryptoBoxRootActions"],
|
||||||
|
"program", "cryptsetup",
|
||||||
"--batch-mode", "isLuks", self.devnodes[0]])
|
"--batch-mode", "isLuks", self.devnodes[0]])
|
||||||
proc.wait()
|
proc.wait()
|
||||||
result = proc.returncode == 0
|
result = proc.returncode == 0
|
||||||
|
@ -532,8 +535,11 @@ class Blockdevice:
|
||||||
shell = False,
|
shell = False,
|
||||||
stdout = subprocess.PIPE,
|
stdout = subprocess.PIPE,
|
||||||
stderr = subprocess.PIPE,
|
stderr = subprocess.PIPE,
|
||||||
args = [ prefs["Programs"]["cryptsetup"],
|
args = [
|
||||||
"luksUUID", self.devnodes[0] ])
|
prefs["Programs"]["super"],
|
||||||
|
prefs["Programs"]["CryptoBoxRootActions"],
|
||||||
|
"program", "cryptsetup",
|
||||||
|
"luksUUID", self.devnodes[0] ])
|
||||||
(output, error) = proc.communicate()
|
(output, error) = proc.communicate()
|
||||||
except OSError, err_msg:
|
except OSError, err_msg:
|
||||||
LOGGER.warning("Failed to call '%s' to determine UUID: %s" \
|
LOGGER.warning("Failed to call '%s' to determine UUID: %s" \
|
||||||
|
|
|
@ -306,7 +306,9 @@ class CryptoBoxContainer:
|
||||||
stdout = subprocess.PIPE,
|
stdout = subprocess.PIPE,
|
||||||
stderr = subprocess.PIPE,
|
stderr = subprocess.PIPE,
|
||||||
args = [
|
args = [
|
||||||
self.cbox.prefs["Programs"]["cryptsetup"],
|
self.cbox.prefs["Programs"]["super"],
|
||||||
|
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
|
||||||
|
"program", "cryptsetup",
|
||||||
"--batch-mode",
|
"--batch-mode",
|
||||||
"luksDelKey",
|
"luksDelKey",
|
||||||
self.get_device(),
|
self.get_device(),
|
||||||
|
|
Loading…
Reference in a new issue