diff options
author | Mike Fulbright <msf@redhat.com> | 2003-04-22 19:21:18 +0000 |
---|---|---|
committer | Mike Fulbright <msf@redhat.com> | 2003-04-22 19:21:18 +0000 |
commit | 1d947ba683b7624e47d1fa6164fe5d6d46a3b592 (patch) | |
tree | 9657709c2933b69c267b8a92f9f023ad8d421c10 | |
parent | 3be0b3bedcb2c98491da925178e0e4ced318c860 (diff) | |
download | anaconda-1d947ba683b7624e47d1fa6164fe5d6d46a3b592.tar.gz anaconda-1d947ba683b7624e47d1fa6164fe5d6d46a3b592.tar.xz anaconda-1d947ba683b7624e47d1fa6164fe5d6d46a3b592.zip |
put code for enabling X configuration it right place and disable it for now
-rw-r--r-- | installclass.py | 6 | ||||
-rw-r--r-- | packages.py | 35 |
2 files changed, 20 insertions, 21 deletions
diff --git a/installclass.py b/installclass.py index d38abbc72..e117ad5e3 100644 --- a/installclass.py +++ b/installclass.py @@ -125,12 +125,6 @@ class BaseInstallClass: "handleX11pkgs", "checkdeps", "dependencies", -# -# Disable interactive X configuration -# -# "videocard", -# "monitor", -# "xcustom", "confirminstall", "install", "enablefilesystems", diff --git a/packages.py b/packages.py index 9caf69dc2..09f1114a3 100644 --- a/packages.py +++ b/packages.py @@ -169,21 +169,26 @@ def handleX11Packages(dir, intf, disp, id, instPath): return # skip X setup if it is not being installed - if (not id.comps.packages.has_key('XFree86') or - not id.comps.packages['XFree86'].selected): - disp.skipStep("videocard") - disp.skipStep("monitor") - disp.skipStep("xcustom") - disp.skipStep("writexconfig") - id.xsetup.skipx = 1 - elif disp.stepInSkipList("videocard"): - # if X is being installed, but videocard step skipped - # need to turn it back on - disp.skipStep("videocard", skip=0) - disp.skipStep("monitor", skip=0) - disp.skipStep("xcustom", skip=0) - disp.skipStep("writexconfig", skip=0) - id.xsetup.skipx = 0 + # + # uncomment this block if you want X configuration to be presented + # +# START BLOCK +# if (not id.comps.packages.has_key('XFree86') or +# not id.comps.packages['XFree86'].selected): +# disp.skipStep("videocard") +# disp.skipStep("monitor") +# disp.skipStep("xcustom") +# disp.skipStep("writexconfig") +# id.xsetup.skipx = 1 +# elif disp.stepInSkipList("videocard"): +# # if X is being installed, but videocard step skipped +# # need to turn it back on +# disp.skipStep("videocard", skip=0) +# disp.skipStep("monitor", skip=0) +# disp.skipStep("xcustom", skip=0) +# disp.skipStep("writexconfig", skip=0) +# id.xsetup.skipx = 0 +# END BLOCK # set default runlevel based on packages gnomeSelected = (id.comps.packages.has_key('gnome-session') |