cryptonas/cryptonas-branches
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed unnecessary "--batch-mode" arguments to cryptsetup; fixed sizing issue with config partition

Browse source 
(cryptsetup is supposed to ignore "--batch-mode" unless given the "luksFormat" command,
but there have been problems with it in the past, for example with "isLuks".)
This commit is contained in:
frisco 2009-06-28 00:53:52 +00:00
parent cccc883b49
commit bbefb316f4
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
staging-v0.3.5/src/cryptobox/core/container.py
View file

@ -284,8 +284,7 @@ class CryptoBoxContainer:
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"program", "cryptsetup",
"luksAddKey",
self.get_device(),
"--batch-mode"])
self.get_device()])
proc.stdin.write("%s\n%s" % (oldpw, newpw))
(output, errout) = proc.communicate()
if proc.returncode != 0:
@ -311,8 +310,7 @@ class CryptoBoxContainer:
"program", "cryptsetup",
"luksDelKey",
self.get_device(),
"%d" % (keyslot, ),
"--batch-mode"])
"%d" % (keyslot, )])
proc.wait()
if proc.returncode != 0:
error_msg = "Could not remove the old luks key: %s" % (proc.stderr.read().strip(), )
@ -454,8 +452,7 @@ class CryptoBoxContainer:
"program", "cryptsetup",
"luksOpen",
self.get_device(),
self.name,
"--batch-mode"])
self.name])
proc.stdin.write(password)
(output, errout) = proc.communicate()
if proc.returncode != 0:
@ -536,8 +533,7 @@ class CryptoBoxContainer:
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"program", "cryptsetup",
"luksClose",
self.name,
"--batch-mode"])
self.name])
proc.wait()
if proc.returncode != 0:
err_msg = "Could not remove the luks mapping: %s" % (proc.stderr.read().strip(), )
@ -705,8 +701,7 @@ class CryptoBoxContainer:
"program", "cryptsetup",
"luksOpen",
self.get_device(),
self.name,
"--batch-mode"])
self.name])
proc.stdin.write(password)
(output, errout) = proc.communicate()
if proc.returncode != 0: