1 files changed, 2 insertions, 2 deletions
diff --git a/anaconda b/anaconda
index 8c688553f..907434432 100755
--- a/anaconda
+++ b/anaconda
@@ -788,7 +788,7 @@ if __name__ == "__main__":
     # now determine if we're going to run in GUI or TUI mode
     #
     # if no X server, we have to use text mode
-    if not (flags.test or flags.rootpath) and (rhpl.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
+    if not (flags.test or flags.rootpath or x_already_set) and (rhpl.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
          stdoutLog.warning(_("Graphical installation not available...  "
                              "Starting text mode."))
          time.sleep(2)
@@ -945,7 +945,7 @@ if __name__ == "__main__":
         anaconda.id.setHeadless(opts.isHeadless)
         instClass.setAsHeadless(anaconda.dispatch, opts.isHeadless)
 
-    instClass.setSteps(anaconda.dispatch)
+    instClass.setSteps(anaconda)
 
     # comment out the next line to make exceptions non-fatal
     sys.excepthook = lambda type, value, tb, anaconda=anaconda: handleException(anaconda, (type, value, tb))