From db6fa7e8e061457071226a4d9a204a90651a9262 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 8 Jan 2015 18:05:43 +0100 Subject: Revert "lvc: explicitly enable serial console via kernel commandline params" This reverts commit 12ffcf67b7269b0a9e2673c3d385ecd21a6d05f9. Instead we use the remote shell as intended by the Tails developers. --- features/step_definitions/common_steps.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb index d055645e..f173a94b 100644 --- a/features/step_definitions/common_steps.rb +++ b/features/step_definitions/common_steps.rb @@ -229,8 +229,7 @@ Given /^the computer (re)?boots DebianLive(|\d+)$/ do |reboot,version| @screen.type(Sikuli::Key.TAB) @screen.waitVanish(bootsplash_tab_msg, 1) - # add extra boot options here - @screen.type(" live-getty console=tty0 console=ttyS0,9600n8 #{@boot_options}" + + @screen.type(" autotest_never_use_this_option #{@boot_options}" + Sikuli::Key.ENTER) @screen.wait("DebianLive#{version}Greeter.png", 5*60) @vm.wait_until_remote_shell_is_up -- cgit v1.2.3-70-g09d2