From d5d4f3afbca477e372f24df2124fb273a9511921 Mon Sep 17 00:00:00 2001
From: Mike Fulbright <msf@redhat.com>
Date: Thu, 19 Jul 2001 19:04:18 +0000
Subject: properly record we have skipped X configuration and act appropriately
 later

---
 packages.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'packages.py')

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')
-- 
cgit