Remove DDC probing support to sync up with how rhpxl is going to work.

4 files changed, 10 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d1c8dde0..05ea81890 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-01  Chris Lumens  <clumens@redhat.com>
+
+	* anaconda:  Remove DDC probing code.
+
+	* docs/command-line.txt:  Remove skipddc documentation.
+
+	* loader2/loader.c (parseCmdLineFlags):  Remove --skipddc parameter.
+
 2006-07-31  Jeremy Katz  <katzj@redhat.com>
 
 	* anaconda.spec: Bump version.
diff --git a/anaconda b/anaconda
index 4973aabac..fc246b5cf 100755
--- a/anaconda
+++ b/anaconda
@@ -207,7 +207,6 @@ def parseOptions():
     op.add_option("--resolution", action="callback", callback=resolution_cb, dest="runres",
                   default="800x600", nargs=1, type="string")
     op.add_option("--serial", action="store_true", default=False)
-    op.add_option("--skipddc", action="store_true", default=False)
     op.add_option("--usefbx", dest="useFBX", action="store_true", default=False)
     op.add_option("--vesa", dest="forcevesa", action="store_true", default=False)
     op.add_option("--virtpconsole")
@@ -459,10 +458,8 @@ def probeHW(opts, x_already_set, xserver):
         # Probe what is available for X and setup a hardware state
         #
         # try to probe interesting hw
-        skipddcprobe = (opts.skipddc or (x_already_set and flags.test))
         skipmouseprobe = not (not os.environ.has_key('DISPLAY') or flags.setupFilesystems)
-        xserver.probeHW(skipDDCProbe=skipddcprobe, skipMouseProbe=skipmouseprobe,
-                        forceVesa=opts.forcevesa)
+        xserver.probeHW(skipMouseProbe=skipmouseprobe, forceVesa=opts.forcevesa)
 
         # if the len(videocards) is zero, then let's assume we're isHeadless
         if len(xserver.videohw.videocards) == 0:
@@ -809,12 +806,7 @@ if __name__ == "__main__":
     # if DISPLAY not set either vnc server failed to start or we're not
     # running on a redirected X display, so start local X server
     if opts.display_mode == 'g' and not os.environ.has_key('DISPLAY') and not flags.usevnc:
-        modes = rhpxl.monitor.Modes()
-
-        if iutil.getPPCMachine() == "PMac":
-            rhpxl.xhwstate.get_valid_resolution(xserver, modes, runres_override, onPMac=True)
-        else:
-            rhpxl.xhwstate.get_valid_resolution(xserver, modes, runres_override)
+        rhpxl.xhwstate.get_valid_resolution(xserver)
 
         # make sure we can write log to ramfs
         if os.access("/tmp/ramfs", os.W_OK):
diff --git a/docs/command-line.txt b/docs/command-line.txt
index a70e9bd30..ef477faf2 100644
--- a/docs/command-line.txt
+++ b/docs/command-line.txt
@@ -38,8 +38,6 @@ nostorage       Do not auto-probe storage devices (SCSI, IDE, RAID)
 
 nopcmcia        Ignore PCMCIA controller in system.
 
-skipddc		Skips DDC probe of monitor, may help if its handing system.
-
 graphical	Force graphical install. Required to have ftp/http use GUI.
 
 text            Force text mode install.
diff --git a/loader2/loader.c b/loader2/loader.c
index 6e9ca7d2c..a791439fc 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -704,7 +704,6 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData,
             }
             else if (!strncasecmp(argv[i], "resolution=", 11) ||
                      !strncasecmp(argv[i], "lowres", 6) ||
-                     !strncasecmp(argv[i], "skipddc", 7) ||
                      !strncasecmp(argv[i], "nomount", 7) ||
                      !strncasecmp(argv[i], "vnc", 3) ||
                      !strncasecmp(argv[i], "vncconnect=", 11) ||