From 33f63c3d951af76d80efe34fc75f57314f5ac62b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 12 Apr 2019 15:54:26 -0700
Subject: [PATCH] rescue_shell_prompt is really just a root console needle...

...so make it look like all the other ones we have already.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 .../console/anaconda_rescue_shell_prompt.json |  22 ------------------
 .../root_logged_in-noprofile-sh44.json        |  16 +++++++++++++
 ....png => root_logged_in-noprofile-sh44.png} | Bin
 tests/preinstall_iso_in_hd.pm                 |   2 +-
 4 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 needles/console/anaconda_rescue_shell_prompt.json
 create mode 100644 needles/console/root_logged_in-noprofile-sh44.json
 rename needles/console/{anaconda_rescue_shell_prompt.png => root_logged_in-noprofile-sh44.png} (100%)

diff --git a/needles/console/anaconda_rescue_shell_prompt.json b/needles/console/anaconda_rescue_shell_prompt.json
deleted file mode 100644
index 1293e767..00000000
--- a/needles/console/anaconda_rescue_shell_prompt.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 0,
-      "ypos": 527,
-      "width": 21,
-      "height": 108,
-      "type": "match"
-    },
-    {
-      "xpos": 49,
-      "ypos": 528,
-      "width": 169,
-      "height": 16,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "rescue_shell_prompt"
-  ]
-}
\ No newline at end of file
diff --git a/needles/console/root_logged_in-noprofile-sh44.json b/needles/console/root_logged_in-noprofile-sh44.json
new file mode 100644
index 00000000..43df73eb
--- /dev/null
+++ b/needles/console/root_logged_in-noprofile-sh44.json
@@ -0,0 +1,16 @@
+{
+    "area": [
+        {
+            "height": 16,
+            "type": "match",
+            "width": 56,
+            "xpos": 0,
+            "ypos": 528
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "root_console",
+        "root_logged_in"
+    ]
+}
\ No newline at end of file
diff --git a/needles/console/anaconda_rescue_shell_prompt.png b/needles/console/root_logged_in-noprofile-sh44.png
similarity index 100%
rename from needles/console/anaconda_rescue_shell_prompt.png
rename to needles/console/root_logged_in-noprofile-sh44.png
diff --git a/tests/preinstall_iso_in_hd.pm b/tests/preinstall_iso_in_hd.pm
index f8dd4435..5b50e954 100644
--- a/tests/preinstall_iso_in_hd.pm
+++ b/tests/preinstall_iso_in_hd.pm
@@ -8,7 +8,7 @@ sub run {
     # select rescue shell and expect shell prompt
     type_string "3\n";
     send_key "ret";
-    assert_screen "rescue_shell_prompt", 5; # should be shell prompt
+    assert_screen "root_console", 5; # should be shell prompt
     assert_script_run "fdisk -l | head -n20";
     assert_script_run "mkdir -p /hd";
     assert_script_run "mount /dev/vdb1 /hd";