diff options
| -rw-r--r-- | iw/xconfig_gui.py | 2 | ||||
| -rw-r--r-- | kickstart.py | 1 | ||||
| -rw-r--r-- | packages.py | 6 | ||||
| -rw-r--r-- | textw/xconfig_text.py | 3 | ||||
| -rw-r--r-- | xf86config.py | 7 |
5 files changed, 18 insertions, 1 deletions
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index aeace0653..fe6aaac47 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -663,10 +663,12 @@ class XConfigWindow (InstallWindow): self.dispatch.skipStep("monitor") self.dispatch.skipStep("xcustom") self.dispatch.skipStep("writexconfig") + self.xconfig.skipx = 1 else: self.dispatch.skipStep("monitor", skip = 0) self.dispatch.skipStep("xcustom", skip = 0) self.dispatch.skipStep("writexconfig", skip = 0) + self.xconfig.skipx = 0 # set videocard type (assuming we're working with PRIMARY card) if self.selected_card: diff --git a/kickstart.py b/kickstart.py index 4b241bf24..a7ca4cdee 100644 --- a/kickstart.py +++ b/kickstart.py @@ -432,6 +432,7 @@ class KickstartBase(BaseInstallClass): self.skipSteps.append("xcustom") self.skipSteps.append("handleX11pkgs") self.skipSteps.append("writexconfig") + id.xconfig.skipx = 1 def doInteractive(self, id, args): self.interactive = 1 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') diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py index d329c243b..f82f6b75f 100644 --- a/textw/xconfig_text.py +++ b/textw/xconfig_text.py @@ -611,12 +611,13 @@ class XConfigWindowCard: self.dispatch.skipStep("monitor") self.dispatch.skipStep("xcustom") self.dispatch.skipStep("writexconfig") - + self.xconfig.skipx = 1 return else: self.dispatch.skipStep("monitor", skip = 0) self.dispatch.skipStep("xcustom", skip = 0) self.dispatch.skipStep("writexconfig", skip = 0) + self.xconfig.skipx = 0 # store selected videocard selection = self.cards[self.cardslist[self.selectedCard]] diff --git a/xf86config.py b/xf86config.py index 861683347..902bf566d 100644 --- a/xf86config.py +++ b/xf86config.py @@ -639,6 +639,9 @@ class XF86Config: self.monlist = {} self.monids = {} + # if skipx is TRUE user has selected to not configure X + self.skipx = 0 + if isys.fbinfo() != None: (x, y, depth) = isys.fbinfo() self.fbDepth = depth @@ -882,6 +885,10 @@ class XF86Config: config.close () def writeKS (self, f): + if self.skipx: + f.write("skipx\n") + return + xmodes = self.getManualModes() if len(xmodes) == 0: |