Set $DISPLAY before threads are started.

$DISPLAY is effectively a constant, so set it early, before the network
thread is started, using a value in pyanaconda.constants.

Author: dashea

anaconda

@@ -120,13 +120,10 @@ def startX11():
 
     # Start Xorg and wait for it become ready
     iutil.startX(["Xorg", "-br", "-logfile", "/tmp/X.log",
-                  ":1", "vt6", "-s", "1440", "-ac",
+                  ":%s" % constants.X_DISPLAY_NUMBER, "vt6", "-s", "1440", "-ac",
                   "-nolisten", "tcp", "-dpi", "96",
                   "-noreset"], output_redirect=xfd)
 
-    # Now that X is started, make $DISPLAY available
-    os.environ["DISPLAY"] = ":1"
-
 # function to handle X startup special issues for anaconda
 def doStartupX11Actions():
     """Start window manager"""
@@ -410,6 +407,12 @@ def setupEnvironment():
     if "LD_PRELOAD" in os.environ:
         del os.environ["LD_PRELOAD"]
 
+    # Go ahead and set $DISPLAY whether we're going to use X or not
+    if 'DISPLAY' in os.environ:
+        flags.preexisting_x11 = True
+    else:
+        os.environ["DISPLAY"] = ":%s" % constants.X_DISPLAY_NUMBER
+
 def setupLoggingFromOpts(options):
     if (options.debug or options.updateSrc) and not options.loglevel:
         # debugging means debug logging if an explicit level hasn't been st
@@ -618,9 +621,6 @@ def setupDisplay(anaconda, options, addons=None):
         stdoutLog.warning("Not asking for VNC because we don't have Xvnc")
         flags.vncquestion = False
 
-    if 'DISPLAY' in os.environ:
-        flags.preexisting_x11 = True
-
     # Should we try to start Xorg?
     want_x = anaconda.displayMode == 'g' and \
              not (flags.preexisting_x11 or flags.usevnc)
@@ -966,10 +966,10 @@ if __name__ == "__main__":
 
         log.error("%s already exists, exiting", pidfile_path)
 
-        # If we have a $DISPLAY and zenity is available, we may be running in
-        # a live environment and we can display an error dialog. Otherwise
-        # just print an error.
-        if "DISPLAY" in os.environ and os.access("/usr/bin/zenity", os.X_OK):
+        # If we had a $DISPLAY at start and zenity is available, we may be
+        # running in a live environment and we can display an error dialog.
+        # Otherwise just print an error.
+        if flags.preexisting_x11 and os.access("/usr/bin/zenity", os.X_OK):
             # The module-level _() calls are ok here because the language may
             # be set from the live environment in this case, and anaconda's
             # language setup hasn't happened yet.

pyanaconda/constants.py

@@ -174,3 +174,6 @@
 # for how long (in seconds) we try to wait for enough entropy for LUKS
 # keep this a multiple of 60 (minutes)
 MAX_ENTROPY_WAIT = 10 * 60
+
+# X display number to use
+X_DISPLAY_NUMBER = 1

pyanaconda/vnc.py

@@ -55,11 +55,10 @@ def shutdownServer():
 
 class VncServer:
 
-    def __init__(self, display="1", root="/", ip=None, name=None,
+    def __init__(self, root="/", ip=None, name=None,
                 password="", vncconnecthost="",
                 vncconnectport="", log_file="/tmp/vncserver.log",
                 pw_file="/tmp/vncpassword"):
-        self.display = display
         self.root = root
         self.ip = ip
         self.name = name
@@ -123,9 +122,11 @@ def initialize(self):
         name_ips = [i[4][0] for i in socket.getaddrinfo(self.name, 0)]
         if self.name is not None and not self.name.startswith('localhost') \
            and ipstr is not None and self.ip in name_ips:
-            self.connxinfo = "%s:%s (%s:%s)" % (socket.getfqdn(name=self.name), self.display, ipstr, self.display)
+            self.connxinfo = "%s:%s (%s:%s)" % \
+                    (socket.getfqdn(name=self.name), constants.X_DISPLAY_NUMBER,
+                     ipstr, constants.X_DISPLAY_NUMBER)
         elif ipstr is not None:
-            self.connxinfo = "%s:%s" % (ipstr, self.display,)
+            self.connxinfo = "%s:%s" % (ipstr, constants.X_DISPLAY_NUMBER)
         else:
             self.connxinfo = None
 
@@ -157,7 +158,7 @@ def connectToView(self):
         else:
             hostarg = self.vncconnecthost
 
-        vncconfigcommand = [self.root+"/usr/bin/vncconfig", "-display", ":%s"%self.display, "-connect", hostarg]
+        vncconfigcommand = [self.root+"/usr/bin/vncconfig", "-display", ":%s" % constants.X_DISPLAY_NUMBER, "-connect", hostarg]
 
         for _i in range(maxTries):
             vncconfp = iutil.startProgram(vncconfigcommand, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # vncconfig process
@@ -184,7 +185,7 @@ def startVncConfig(self):
 
         self.log.info(_("Attempting to start vncconfig"))
 
-        vncconfigcommand = [self.root+"/usr/bin/vncconfig", "-nowin", "-display", ":%s" % self.display]
+        vncconfigcommand = [self.root+"/usr/bin/vncconfig", "-nowin", "-display", ":%s" % constants.X_DISPLAY_NUMBER]
 
         # Use startProgram to run vncconfig in the background
         iutil.startProgram(vncconfigcommand, stdout=self.openlogfile(), stderr=subprocess.STDOUT)
@@ -199,7 +200,7 @@ def VNCListen(self):
         else:
             self.log.info(_("Please manually connect your vnc client to <IP ADDRESS>:%s "
                             "to begin the install. Switch to the shell (Ctrl-B 2) and "
-                            "run 'ip addr' to find the <IP ADDRESS>."), self.display)
+                            "run 'ip addr' to find the <IP ADDRESS>."), constants.X_DISPLAY_NUMBER)
 
     def startServer(self):
         self.log.info(_("Starting VNC..."))
@@ -226,7 +227,7 @@ def startServer(self):
             self.setVNCPassword()
 
         # Lets start the xvnc.
-        xvnccommand =  [ XVNC_BINARY_NAME, ":%s" % self.display,
+        xvnccommand =  [ XVNC_BINARY_NAME, ":%s" % constants.X_DISPLAY_NUMBER,
                         "-depth", "16", "-br",
                         "IdleTimeout=0", "-auth", "/dev/null", "-once",
                         "DisconnectClients=false", "desktop=%s" % (self.desktop,),
@@ -266,8 +267,6 @@ def startServer(self):
         else:
             self.VNCListen()
 
-        os.environ["DISPLAY"]=":%s" % self.display
-
         # Start vncconfig for copy/paste
         self.startVncConfig()