From e8945e0305182f272258ed789cfde068b9ff81b9 Mon Sep 17 00:00:00 2001
From: Trevor Cooper <tcooper@rockylinux.org>
Date: Sat, 2 Jul 2022 22:06:17 -0700
Subject: [PATCH] Short circuit auto addition of _console_wait_login for tests
 without DESKTOP

---
 main.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.pm b/main.pm
index 52a7d43e..94eab2f7 100644
--- a/main.pm
+++ b/main.pm
@@ -249,7 +249,8 @@ sub _load_early_postinstall_tests {
 
     # For now, there's no possibility to get a graphical desktop on
     # Modular composes, so short-circuit here for those
-    if (get_var("MODULAR")) {
+    # Rocky has no such thing as MODULAR composes.
+    if (!get_var("DESKTOP") || get_var("DESKTOP") eq "false") {
         _load_instance("tests/_console_wait_login", $instance);
         return;
     }