Browse Source

fix remaining issue of cryptsetup v1.0.5 (continues r1102)

master
lars 14 years ago
parent
commit
87289af11a
  1. 6
      bin/CryptoBoxRootActions
  2. 4
      src/cryptobox/core/container.py

6
bin/CryptoBoxRootActions

@ -247,8 +247,10 @@ def run_cryptsetup(args):
elif action == "luksDelKey":
if len(args) < 2: raise "WrongArguments", "missing arguments"
device = args[0]; del args[0]
cmd_args.insert(-1, action)
cmd_args.insert(-1, device)
slot = args[0]; del args[0]
cmd_args.append(action)
cmd_args.append(device)
cmd_args.append(slot)
elif action == "isLuks":
device = args[0]; del args[0]
cmd_args.append(action)

4
src/cryptobox/core/container.py

@ -309,10 +309,10 @@ class CryptoBoxContainer:
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"program", "cryptsetup",
"--batch-mode",
"luksDelKey",
self.get_device(),
"%d" % (keyslot, )])
"%d" % (keyslot, ),
"--batch-mode"])
proc.wait()
if proc.returncode != 0:
error_msg = "Could not remove the old luks key: %s" % (proc.stderr.read().strip(), )

Loading…
Cancel
Save