2006-03-06 Jeremy Katz <katzj@redhat.com>

	* anaconda: Add magic 'vesa' flag to force the X driver to be vesa
	instead of the native
	* loader2/loader.c: Add it here.

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c7493e31d..05939d324 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-03-06  Jeremy Katz  <katzj@redhat.com>
 
+	* anaconda: Add magic 'vesa' flag to force the X driver to be vesa
+	instead of the native
+	* loader2/loader.c: Add it here.
+
 	* yuminstall.py (YumBackend.getBestKernelByArch): New xen kernel
 	package naming
 
diff --git a/anaconda b/anaconda
index ffbcb2ecc..100aa10c4 100755
--- a/anaconda
+++ b/anaconda
@@ -430,7 +430,7 @@ try:
 	    'autostep', 'resolution=', 'skipddc', 'noselinux', 'selinux',
 	    'vnc', 'vncconnect=', 'vnc=', 'cmdline', 'headless', 'usefbx',
 	    'virtpconsole=', 'loglevel=', 'syslog=', 'nodmraid','dmraid',
-	    'iscsi'])
+	    'iscsi', 'vesa'])
 except TypeError, msg:
     sys.stderr.write("Error %s\n:" % msg)
     sys.exit(-1)
@@ -463,6 +463,7 @@ progmode = 'install' 		# 'rescue', or 'install'
 method = None			# URL representation of install method
 display_mode = None
 graphical_failed = 0
+forcevesa = False               # force vesa driver for X instead of probed
 
 
 # should we ever try to probe for X stuff?  this will give us a convenient
@@ -574,6 +575,8 @@ for n in args:
 	flags.dmraid = 1
     elif (str == "--skipddc"):	
 	skipddc = 1
+    elif (str == "--vesa"):
+        forcevesa = True
     elif (str == "--autostep"):
 	flags.autostep = 1
     elif (str == '-r' or str == '--rootpath'):
@@ -885,7 +888,8 @@ if not isHeadless:
     skipmouseprobe = not (not os.environ.has_key('DISPLAY') or flags.setupFilesystems)
 
     (videohw, monitorhw, mousehw) = xserver.probeHW(skipDDCProbe=skipddcprobe,
-						    skipMouseProbe = skipmouseprobe)
+						    skipMouseProbe=skipmouseprobe,
+                                                    forceVesa=forcevesa)
     # if the len(videocards) is zero, then let's assume we're isHeadless
     if len(videohw.videocards) == 0:
 	stdoutLog.info (_("No video hardware found, assuming headless"))
diff --git a/loader2/loader.c b/loader2/loader.c
index 4c9ff3834..610c29e24 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -697,6 +697,7 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData,
                 !strncasecmp(argv[i], "usefbx", 6) ||
                 !strncasecmp(argv[i], "dmraid", 6) ||
                 !strncasecmp(argv[i], "nodmraid", 8) ||
+                !strncasecmp(argv[i], "vesa", 4) ||
                 !strncasecmp(argv[i], "syslog=", 7)) { 
                 int arglen;