summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-01-08 18:05:43 +0100
committerHolger Levsen <holger@layer-acht.org>2015-01-08 18:05:43 +0100
commitdb6fa7e8e061457071226a4d9a204a90651a9262 (patch)
tree2ce2a6e9749d6b388a02453b0327b6c8a9f8bf06
parentb65883d343910a81a96707ff4e32f333410ca0f9 (diff)
downloadjenkins.debian.net-db6fa7e8e061457071226a4d9a204a90651a9262.tar.xz
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.
-rw-r--r--features/step_definitions/common_steps.rb3
1 files changed, 1 insertions, 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