2005-05-03 Jeremy Katz <katzj@redhat.com>

	* anaconda: More pmac X hacking -- look at what the fb is running
	at and use that as the resolution to try.

2 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6534d343d..2d696ca32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-03  Jeremy Katz  <katzj@redhat.com>
+
+	* anaconda: More pmac X hacking -- look at what the fb is running
+	at and use that as the resolution to try.
+
 2005-05-02  Jeremy Katz  <katzj@redhat.com>
 
 	* anaconda.spec: Bump version.
diff --git a/anaconda b/anaconda
index 712109bca..7ac009bc5 100755
--- a/anaconda
+++ b/anaconda
@@ -911,6 +911,14 @@ if display_mode == 'g' and not os.environ.has_key('DISPLAY') and not flags.usevn
     # if no monitor probed lets guess based on runres
     hsync = monitorhw.getMonitorHorizSync()
     vsync = monitorhw.getMonitorVertSync()
+
+    # if we're on a pmac, try to use the fb resolution
+    if not runres_override and iutil.getPPCMachine() == "PMac":
+        fbinfo = isys.fbinfo()
+        fbres = "%sx%s" %(fbinfo[0], fbinfo[1])
+        if monitor.monitor_supports_mode(hsync, vsync, fbres):
+            runres = fbres
+    
     res_supported = monitor.monitor_supports_mode(hsync, vsync,  runres)
 
     # XXX: this is a bit of a hack, but there are a reasonable number of