lvc: drop some unneeded cleverness re. LVM names

Signed-off-by: Holger Levsen <holger@layer-acht.org>

2 files changed, 3 insertions, 4 deletions

diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 8085c048..be5e887d 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -152,9 +152,8 @@ Given /^the computer is set to boot from the Tails DVD$/ do
   $vm.set_cdrom_boot(TAILS_ISO)
 end
 
-Given /^the computer is set to boot from (.+?) drive "(.+?)"$/ do |type, name|
-  debug_log("debug: setting computer to boot from drive: name='#{name}' (type=#{type})", :color => :blue)
-  $vm.set_disk_boot(name, type.downcase)
+Given /^the computer is set to boot from (.+?) drive$/ do |type|
+  $vm.set_disk_boot(JOB_NAME, type.downcase)
 end
 
 Given /^I (temporarily )?create a (\d+) ([[:alpha:]]+) disk named "([^"]+)"$/ do |temporary, size, unit, name|
diff --git a/cucumber/features/step_definitions/snapshots.rb b/cucumber/features/step_definitions/snapshots.rb
index d90293ad..d3d343d5 100644
--- a/cucumber/features/step_definitions/snapshots.rb
+++ b/cucumber/features/step_definitions/snapshots.rb
@@ -42,7 +42,7 @@ def checkpoints
             'I allow reboot after the install is complete',
             'I wait for the reboot',
             'I power off the computer',
-            'the computer is set to boot from ide drive "'+JOB_NAME+'"',
+            'the computer is set to boot from ide drive',
           ]
         }
     end