diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-04-13 21:22:15 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-04-13 21:22:15 +0000 |
| commit | 52ccb0ac6757b9f9d122a0b9e08422e9b1a44269 (patch) | |
| tree | 9e3cd9223a82c2a7f90a22bac492f644eec38161 | |
| parent | 77aa5261160bd3c21b4a2cbe18070fc5aeae79d0 (diff) | |
| download | anaconda-52ccb0ac6757b9f9d122a0b9e08422e9b1a44269.tar.gz anaconda-52ccb0ac6757b9f9d122a0b9e08422e9b1a44269.tar.xz anaconda-52ccb0ac6757b9f9d122a0b9e08422e9b1a44269.zip | |
some xorg-x11 changes
| -rw-r--r-- | iw/xconfig_gui.py | 2 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 1 | ||||
| -rw-r--r-- | textw/xconfig_text.py | 2 | ||||
| -rw-r--r-- | upgrade.py | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index 47e713e97..e85aa644f 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -824,7 +824,7 @@ class XConfigWindow (InstallWindow): card_data = primary_card.getCardData() if (card_data.has_key("DRIVER") and not card_data.has_key("UNSUPPORTED")): - server = "XFree86" + server = "XOrg" else: server = "XF86_" + card_data["SERVER"] diff --git a/scripts/upd-instroot b/scripts/upd-instroot index d5bfaa924..342576446 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -509,6 +509,7 @@ sbin/parted sbin/silo sbin/tune2fs usr/X11R6/bin/XFree86 +usr/X11R6/bin/XOrg usr/X11R6/bin/setxkbmap usr/X11R6/bin/xsetroot usr/X11R6/lib/X11/XKeysymDB diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py index b28c6453e..fc9945ae3 100644 --- a/textw/xconfig_text.py +++ b/textw/xconfig_text.py @@ -726,7 +726,7 @@ class XConfigWindowCard: card_data = primary_card.getCardData() if (card_data.has_key("DRIVER") and not card_data.has_key("UNSUPPORTED")): - server = "XFree86" + server = "XOrg" else: server = "XF86_" + card_data["SERVER"] diff --git a/upgrade.py b/upgrade.py index 1231aab9e..f958e1cde 100644 --- a/upgrade.py +++ b/upgrade.py @@ -461,7 +461,7 @@ def upgradeFindPackages(intf, method, id, instPath, dir): h[rpm.RPMTAG_VERSION], h[rpm.RPMTAG_RELEASE])) found = 1 - if h[rpm.RPMTAG_NAME] == "XFree86": + if h[rpm.RPMTAG_NAME] == "XFree86" or h[rpm.RPMTAG_NAME] == "xorg-x11" hasX = 1 if h[rpm.RPMTAG_NAME] == "nautilus": hasFileManager = 1 |