diff --git a/lib/installedtest.pm b/lib/installedtest.pm index 0a6ec9dd..1f0d5955 100644 --- a/lib/installedtest.pm +++ b/lib/installedtest.pm @@ -33,9 +33,12 @@ sub root_console { sub post_fail_hook { my $self = shift; - if (check_screen 'emergency_rescue', 3) { - my $password = get_var("ROOT_PASSWORD", "weakpassword"); - type_string "$password\n"; + if (check_screen ['emergency_rescue', 'emergency_rescue_nopassword'], 3) { + if (match_has_tag 'emergency_rescue') { + my $password = get_var("ROOT_PASSWORD", "weakpassword"); + type_string "$password"; + } + send_key 'ret'; # bring up network so we can upload logs assert_script_run "dhclient"; } diff --git a/needles/console/emergency_rescue_nopassword-20201028.json b/needles/console/emergency_rescue_nopassword-20201028.json new file mode 100644 index 00000000..b8e4725d --- /dev/null +++ b/needles/console/emergency_rescue_nopassword-20201028.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "height": 16, + "width": 216, + "type": "match", + "ypos": 736, + "xpos": 0 + } + ], + "properties": [], + "tags": [ + "LANGUAGE-english", + "emergency_rescue_nopassword" + ] +} \ No newline at end of file diff --git a/needles/console/emergency_rescue_nopassword-20201028.png b/needles/console/emergency_rescue_nopassword-20201028.png new file mode 100644 index 00000000..ea2ae5c1 Binary files /dev/null and b/needles/console/emergency_rescue_nopassword-20201028.png differ