summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xanaconda4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 38d1435ad..358431112 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-05 Chris Lumens <clumens@redhat.com>
+
+ * anaconda (parseOptions): --usefbx is really just a special case of
+ --xdriver.
+
2006-10-05 Paul Nasrat <pnasrat@redhat.com>
* urlinstall.py: Fix traceback with loopback isos
diff --git a/anaconda b/anaconda
index d879ecc3a..58f386595 100755
--- a/anaconda
+++ b/anaconda
@@ -208,7 +208,7 @@ 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("--usefbx", dest="useFBX", action="store_true", default=False)
+ op.add_option("--usefbx", dest="xdriver", action="store_const", const="fbdev")
op.add_option("--virtpconsole")
op.add_option("--vnc", action="store_true", default=False)
op.add_option("--vncconnect")
@@ -834,7 +834,7 @@ if __name__ == "__main__":
xserver.addExtraScreen("Anaconda")
xserver.display = ":1"
xserver.serverflags.extend(["-screen", "Anaconda"])
- xserver.startX(xStartedCB=doStartupX11Actions, useFB=opts.useFBX)
+ xserver.startX(xStartedCB=doStartupX11Actions)
except RuntimeError:
stdoutLog.warning(" X startup failed, falling back to text mode")
opts.display_mode = 't'