From 9fa6376672dde1f7e8a0c299388056c71f92d625 Mon Sep 17 00:00:00 2001 From: age Date: Mon, 7 Apr 2008 10:42:37 +0000 Subject: [PATCH] * cryptsetup demands running with uid=0 since v1.0.5 --- src/cryptobox/core/blockdevice.py | 12 +++++++++--- src/cryptobox/core/container.py | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/cryptobox/core/blockdevice.py b/src/cryptobox/core/blockdevice.py index 01561e0..6208c77 100644 --- a/src/cryptobox/core/blockdevice.py +++ b/src/cryptobox/core/blockdevice.py @@ -333,7 +333,10 @@ class Blockdevice: shell = False, stdout = subprocess.PIPE, stderr = subprocess.PIPE, - args = [ prefs["Programs"]["cryptsetup"], + args = [ + prefs["Programs"]["super"], + prefs["Programs"]["CryptoBoxRootActions"], + "program", "cryptsetup", "--batch-mode", "isLuks", self.devnodes[0]]) proc.wait() result = proc.returncode == 0 @@ -532,8 +535,11 @@ class Blockdevice: shell = False, stdout = subprocess.PIPE, stderr = subprocess.PIPE, - args = [ prefs["Programs"]["cryptsetup"], - "luksUUID", self.devnodes[0] ]) + args = [ + prefs["Programs"]["super"], + prefs["Programs"]["CryptoBoxRootActions"], + "program", "cryptsetup", + "luksUUID", self.devnodes[0] ]) (output, error) = proc.communicate() except OSError, err_msg: LOGGER.warning("Failed to call '%s' to determine UUID: %s" \ diff --git a/src/cryptobox/core/container.py b/src/cryptobox/core/container.py index b40a07d..04a4dc6 100644 --- a/src/cryptobox/core/container.py +++ b/src/cryptobox/core/container.py @@ -306,7 +306,9 @@ class CryptoBoxContainer: stdout = subprocess.PIPE, stderr = subprocess.PIPE, args = [ - self.cbox.prefs["Programs"]["cryptsetup"], + self.cbox.prefs["Programs"]["super"], + self.cbox.prefs["Programs"]["CryptoBoxRootActions"], + "program", "cryptsetup", "--batch-mode", "luksDelKey", self.get_device(),