3 files changed, 11 insertions, 1 deletions
diff --git a/cucumber/features/images/d-i_gui_CheckSyslog.png b/cucumber/features/images/d-i_gui_CheckSyslog.png
new file mode 100644
index 00000000..9c52c29e
--- /dev/null
+++ b/cucumber/features/images/d-i_gui_CheckSyslog.png
diff --git a/cucumber/features/images/d-i_text_CheckSyslog.png b/cucumber/features/images/d-i_text_CheckSyslog.png
new file mode 100644
index 00000000..f7d18b28
--- /dev/null
+++ b/cucumber/features/images/d-i_text_CheckSyslog.png
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 6ebaf047..a7b08701 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -379,7 +379,17 @@ Given /^I select full-disk, single-filesystem partitioning$/ do
 end
 
 Given /^I note that the Base system is being installed$/ do
-  @screen.wait(diui_png("InstallingBaseSystem"), 30 * PATIENCE)
+  on_screen, _ = @screen.waitAny([diui_png("CheckSyslog"),diui_png("InstallingBaseSystem")], 30 * PATIENCE)
+  on_screen, _ = @screen.waitAny([diui_png("CheckSyslog"),diui_png("InstallingBaseSystem")], 30 * PATIENCE)
+  if diui_png("CheckSyslog") == on_screen
+    if "gui" == @ui_mode
+      @screen.type(Sikuli::Key.F4) # for this to work, we need to remap the keyboard -- CtrlAltF4 is apparently untypable :-(
+    else
+      @screen.type(Sikuli::Key.F4, Sikuli::KeyModifier.ALT)
+    end
+    sleep(10)
+    raise "Failed to install the Base system"
+  end
   debug_log("debug: Found InstallingBaseSystem. Wait for it to vanish", :color => :blue)
   @screen.waitVanish(diui_png("InstallingBaseSystem"), 15 * 60 * PATIENCE)
   debug_log("debug: InstallingBaseSystem vanished", :color => :blue)