summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-05-21 23:56:01 +0200
committerHolger Levsen <holger@layer-acht.org>2016-05-22 00:04:26 +0200
commitb7680495ff489f236380fed46545166e53503e38 (patch)
tree82ba8ea5bcd61b2b4863237400c880a9ac673344
parentcfddbe60036a058d7287fdf8aa1d70f22a7e42b3 (diff)
downloadjenkins.debian.net-b7680495ff489f236380fed46545166e53503e38.tar.xz
lvc: disable kernel command line editing, for now
-rw-r--r--cucumber/features/step_definitions/common_steps.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index d0a61aad..d0b1227e 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -276,10 +276,12 @@ Given /^I select ([a-z]*) mode and wait for the remote shell$/ do |ui_mode|
@screen.wait("d-i_bootmenu_graphical.png", 10)
end
- @screen.type(Sikuli::Key.TAB)
- @screen.type(' preseed/early_command="echo DPMS=-s\\\\ 0 > /lib/debian-installer.d/S61Xnoblank ; sed -i \'/XF86_Switch_VT_/s/ F\([0-9]\)/ XF86_Switch_VT_\1/\' /usr/share/X11/xkb/symbols/srvr_ctrl ; echo ttyS0::askfirst:-/bin/sh>>/etc/inittab;kill -HUP 1"' + " blacklist=psmouse #{@boot_options}" +
- Sikuli::Key.ENTER)
+ #@screen.type(Sikuli::Key.TAB)
+ #@screen.type(' preseed/early_command="echo DPMS=-s\\\\ 0 > /lib/debian-installer.d/S61Xnoblank ; sed -i \'/XF86_Switch_VT_/s/ F\([0-9]\)/ XF86_Switch_VT_\1/\' /usr/share/X11/xkb/symbols/srvr_ctrl ; echo ttyS0::askfirst:-/bin/sh>>/etc/inittab;kill -HUP 1"' + " blacklist=psmouse #{@boot_options}" +
+ # Sikuli::Key.ENTER)
#$vm.wait_until_remote_shell_is_up
+
+ @screen.type(Sikuli::Key.ENTER) # we're disabling the above editing of the command line, since it's breaking on jenkins.debian.net for reasons unknown
@screen.wait(diui_png("English",ui_mode), 3*60) # FIXME -- this is just to pause until the remote shell would have been up, so is a kludge
end