write log file for X to /tmp/ramfs so we can guess LCD modes

1 files changed, 13 insertions, 14 deletions

diff --git a/anaconda b/anaconda
index 50e0bdc93..d146e5eb1 100755
--- a/anaconda
+++ b/anaconda
@@ -530,20 +530,11 @@ if display_mode == 'g' and not os.environ.has_key('DISPLAY'):
     res_supported = monitor.monitor_supports_mode(hsync, vsync,  runres)
     
     if not res_supported:
-	if runres == "800x600":
-	    monitorhw.setSpecs("31.5-48.5", "50-70")
-	elif runres == "1024x768":
-	    monitorhw.setSpecs("31.5-48.5", "40-70")
-	elif runres == "1280x1024":
-	    monitorhw.setSpecs("31.5-67", "50-75")
-	elif runres == "1400x1050":
-	    monitorhw.setSpecs("31.5-90", "59-75")
-	elif runres == "1600x1200":
-	    monitorhw.setSpecs("31.5-90", "60")
-	else:
-	    # just pick something reasonable for most modes
-	    monitorhw.setSpecs("31.5-65.0", "50-90")
+	import rhpl.guesslcd as guesslcd
 
+	(hsync, vsync) = guesslcd.getSyncForRes(runres)
+	monitorhw.setSpecs(hsync, vsync)
+	
 	# XXX - need to fix
 	#
 	# messy hack for how rhpl.xhwstate works
@@ -554,10 +545,18 @@ if display_mode == 'g' and not os.environ.has_key('DISPLAY'):
 	monitorhw.orig_monHoriz = hsync
 	monitorhw.orig_monVert  = vsync
 
+
+    # make sure we can write log to ramfs
+    if os.access("/tmp/ramfs", os.W_OK):
+	xlogfile = "/tmp/ramfs/X.log"
+    else:
+	xlogfile = None
+	
     xsetup_failed = xserver.startXServer(videohw, monitorhw, mousehw, kbd,
 					 runres,
 					 xStartedCB=doStartupX11Actions,
-					 xQuitCB=doShutdownX11Actions)
+					 xQuitCB=doShutdownX11Actions,
+					 logfile="/tmp/ramfs/X.log")
 
     if xsetup_failed:
 	dup_log(" X startup failed, falling back to text mode")