summaryrefslogtreecommitdiffstats
path: root/packages.py
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2001-07-19 19:04:18 +0000
committerMike Fulbright <msf@redhat.com>2001-07-19 19:04:18 +0000
commitd5d4f3afbca477e372f24df2124fb273a9511921 (patch)
tree9fbc6f158db8eea322259537c5f6decc41ebc2ca /packages.py
parentaf3d75dacdc8f8f90e9e32445d4347516d4ed9e2 (diff)
downloadanaconda-d5d4f3afbca477e372f24df2124fb273a9511921.tar.gz
anaconda-d5d4f3afbca477e372f24df2124fb273a9511921.tar.xz
anaconda-d5d4f3afbca477e372f24df2124fb273a9511921.zip
properly record we have skipped X configuration and act appropriately later
Diffstat (limited to 'packages.py')
-rw-r--r--packages.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages.py b/packages.py
index 406f5faef..343aa8710 100644
--- a/packages.py
+++ b/packages.py
@@ -61,6 +61,10 @@ def writeKSConfiguration(id, instPath):
def writeXConfiguration(id, instPath):
if flags.test:
return
+
+ if id.xconfig.skipx:
+ return
+
xserver = id.videocard.primaryCard().getXServer()
if not xserver:
return
@@ -116,6 +120,7 @@ def handleX11Packages(dir, intf, disp, id, instPath):
disp.skipStep("monitor")
disp.skipStep("xcustom")
disp.skipStep("writexconfig")
+ id.xconfig.skipx = 1
elif disp.stepInSkipList("videocard"):
# if X is being installed, but videocard step skipped
# need to turn it back on
@@ -123,6 +128,7 @@ def handleX11Packages(dir, intf, disp, id, instPath):
disp.skipStep("monitor", skip=0)
disp.skipStep("xcustom", skip=0)
disp.skipStep("writexconfig", skip=0)
+ id.xconfig.skipx = 0
# set default runlevel based on packages
gnomeSelected = (id.comps.packages.has_key('gnome-core')