From f51a80435727ede3635efe1e14305904eadfb8f2 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 28 Oct 2020 15:21:03 -0700 Subject: [PATCH] Handle emergency console entry with no password This happens on ARM disk images. Signed-off-by: Adam Williamson --- lib/installedtest.pm | 9 ++++++--- .../emergency_rescue_nopassword-20201028.json | 16 ++++++++++++++++ .../emergency_rescue_nopassword-20201028.png | Bin 0 -> 7354 bytes 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 needles/console/emergency_rescue_nopassword-20201028.json create mode 100644 needles/console/emergency_rescue_nopassword-20201028.png 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 0000000000000000000000000000000000000000..ea2ae5c1f8780bfd69d7904952536be76b2ccd21 GIT binary patch literal 7354 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 literal 0 HcmV?d00001