summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-06-05 19:58:08 +0000
committerChris Lumens <clumens@redhat.com>2007-06-05 19:58:08 +0000
commit4487d6eaa667bcd4f8d6345449729c15905c9234 (patch)
treeb5c808a3c946977ddc6d1af5394a068f393ad484
parentb3ee9519bb7572c81b3e472be33bb8f274734822 (diff)
downloadanaconda-4487d6eaa667bcd4f8d6345449729c15905c9234.tar.gz
anaconda-4487d6eaa667bcd4f8d6345449729c15905c9234.tar.xz
anaconda-4487d6eaa667bcd4f8d6345449729c15905c9234.zip
Pass -br to the X server so there's no more hatch (#195919).
-rw-r--r--ChangeLog6
-rwxr-xr-xanaconda4
-rw-r--r--vnc.py4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a280e3f05..d76cc7d9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-05 Chris Lumens <clumens@redhat.com>
+
+ * anaconda: Pass -br to the X server so there's no more hatch
+ (#195919).
+ * vnc.py (startVNCServer): Likewise.
+
2007-06-01 David Cantrell <dcantrell@redhat.com>
* zfcp.py (ZFCPDevice): We need to echo 1 to online for each LUN
diff --git a/anaconda b/anaconda
index 514028c35..aa53c224f 100755
--- a/anaconda
+++ b/anaconda
@@ -15,7 +15,7 @@
#
# ... And many others
#
-# Copyright 1999-2006 Red Hat, Inc.
+# Copyright 1999-2007 Red Hat, Inc.
#
# This software may be freely redistributed under the terms of the GNU
# library public license.
@@ -831,7 +831,7 @@ if __name__ == "__main__":
xserver.generateConfig()
xserver.addExtraScreen("Anaconda")
xserver.display = ":1"
- xserver.serverflags.extend(["-screen", "Anaconda"])
+ xserver.serverflags.extend(["-screen", "Anaconda", "-br"])
xserver_pid = xserver.startX(xStartedCB=doStartupX11Actions)
except RuntimeError:
stdoutLog.warning(" X startup failed, falling back to text mode")
diff --git a/vnc.py b/vnc.py
index bd2bcb3ff..097ca0039 100644
--- a/vnc.py
+++ b/vnc.py
@@ -1,7 +1,7 @@
#
# vnc.py: VNC related installer functionality
#
-# Copyright 2004 Red Hat, Inc.
+# Copyright 2004,2007 Red Hat, Inc.
#
# Jeremy Katz <katzj@redhat.com>
#
@@ -235,7 +235,7 @@ def startVNCServer(vncpassword="", root='/', vncconnecthost="",
if not vncpid:
args = [ root + "/usr/bin/Xvnc", ":1", "-nevershared",
- "-depth", "16", "-geometry", "800x600",
+ "-depth", "16", "-geometry", "800x600", "-br",
"IdleTimeout=0", "-auth", "/dev/null", "-once",
"DisconnectClients=false", "desktop=%s" % (desktopname,)]