From b7680495ff489f236380fed46545166e53503e38 Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Sat, 21 May 2016 23:56:01 +0200 Subject: lvc: disable kernel command line editing, for now --- cucumber/features/step_definitions/common_steps.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'cucumber') 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 -- cgit v1.2.3-70-g09d2