summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-07-13 20:03:53 +0000
committerintrigeri <intrigeri@boum.org>2016-07-13 20:03:53 +0000
commitaf176be06288691966e5f4c196a6d7175d743744 (patch)
treeaf9c037cd49ae3315485d7ab7864f733df9d2649
parentb07895f16b03383d532e38895d93d5dfad3eab59 (diff)
parent8736e806686029cb0c96a149b7079c9ca5a55059 (diff)
Merge remote-tracking branch 'origin/test/10558-proper-luks-volume-quoting' into stable
Fix-committed: #11558 (erroneous ticket number in branch name)
-rw-r--r--features/step_definitions/usb.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index a1d333a..03815b4 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -283,10 +283,10 @@ Then /^a Tails persistence partition exists on USB drive "([^"]+)"$/ do |name|
# The LUKS container may already be opened, e.g. by udisks after
# we've run tails-persistence-setup.
- c = $vm.execute("ls -1 /dev/mapper/")
+ c = $vm.execute("ls -1 --hide 'control' /dev/mapper/")
if c.success?
for candidate in c.stdout.split("\n")
- luks_info = $vm.execute("cryptsetup status #{candidate}")
+ luks_info = $vm.execute("cryptsetup status '#{candidate}'")
if luks_info.success? and luks_info.stdout.match("^\s+device:\s+#{dev}$")
luks_dev = "/dev/mapper/#{candidate}"
break
@@ -309,7 +309,7 @@ Then /^a Tails persistence partition exists on USB drive "([^"]+)"$/ do |name|
mount_dir = "/mnt/#{name}"
$vm.execute("mkdir -p #{mount_dir}")
- c = $vm.execute("mount #{luks_dev} #{mount_dir}")
+ c = $vm.execute("mount '#{luks_dev}' #{mount_dir}")
assert(c.success?,
"Couldn't mount opened LUKS device '#{dev}' on drive '#{name}'")