[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[firstboot rhel5] Check if we are on an arch which supports GUI



We need to check for noX before checking if the
environment has a DISPLAY. This fixes the case,
when the user runs firstboot manually from GUI
on architectures where only firstboot-tui is
supported.
---
 src/firstboot |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/firstboot b/src/firstboot
index d16c086..ac3bf03 100755
--- a/src/firstboot
+++ b/src/firstboot
@@ -96,7 +96,7 @@ if __name__ == "__main__":
     # reconfig mode from a terminal under an already running X setup.
     # Otherwise, run in text mode if in runlevel 3, or take over rhgb's X
     # server if running, or start up our own if not.
-    if os.environ.has_key("DISPLAY") or fb.doDebug:
+    if (not noX and os.environ.has_key("DISPLAY")) or fb.doDebug:
         from firstbootWindow import firstbootWindow
         firstbootWindow(fb)
     elif (getRunlevel() == 3 and not fb.forcegui) or noX == True:
-- 
1.7.1.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]