From e82e60f71b823f0430deb87013ba734091ced6f4 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 3 Nov 2008 21:39:41 +0000 Subject: [PATCH] Don't override XAUTHORITY until after we run Xephyr Don't override the setting of XAUTHORITY when running Xephyr, since then we may not be able to connect to the host display. Instead pass in the local auth file via the -auth command line argument. An alternate fix would be to use 'xauth merge' to merge the existing XAUTHORITY file into our local file. svn path=/trunk/; revision=29 --- scripts/start-in-Xephyr | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/start-in-Xephyr b/scripts/start-in-Xephyr index 0b20b1927..88c79a3b1 100755 --- a/scripts/start-in-Xephyr +++ b/scripts/start-in-Xephyr @@ -29,14 +29,19 @@ try: hexkey = "".join(("%02x" % ord(byte) for byte in key)) # Store that in an xauthority file as the key for connecting to our Xephyr - os.environ['XAUTHORITY'] = xauth_file - retcode = subprocess.call(["xauth", "add", display, "MIT-MAGIC-COOKIE-1", hexkey]) + retcode = subprocess.call(["xauth", + "-f", xauth_file, + "add", display, "MIT-MAGIC-COOKIE-1", hexkey]) if retcode != 0: raise RuntimeError("xauth failed") # Launch Xephyr - xephyr = subprocess.Popen(["Xephyr", display, "-screen", "800x600", "-host-cursor"]) + xephyr = subprocess.Popen(["Xephyr", display, + "-auth", xauth_file, + "-screen", "800x600", + "-host-cursor"]) os.environ['DISPLAY'] = display + os.environ['XAUTHORITY'] = xauth_file # Wait for server to get going: LAME time.sleep(1)