diff options
| -rw-r--r-- | dispatch.py | 2 | ||||
| -rw-r--r-- | iw/xconfig_gui.py | 7 | ||||
| -rw-r--r-- | textw/xconfig_text.py | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dispatch.py b/dispatch.py index dc8523767..0b3bb5e00 100644 --- a/dispatch.py +++ b/dispatch.py @@ -129,7 +129,7 @@ installSteps = [ ("videocard", ("dispatch", "id.xconfig", "id.videocard", "intf")), ("monitor", ("id.xconfig", "id.monitor")), ("xcustom", ("id.xconfig", "id.monitor", "id.videocard", - "id.desktop", "id.comps")), + "id.desktop", "id.comps", "instPath")), ("writexconfig", writeXConfiguration, ("id", "instPath")), ("writeksconfig", writeKSConfiguration, ("id", "instPath")), ("complete", ()), diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index 5ed077f23..a1b639c6b 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -65,7 +65,7 @@ class XCustomWindow (InstallWindow): self.xconfig.setManualModes(newmodes) try: - self.xconfig.test (root="/mnt/sysimage/") + self.xconfig.test (root=self.instPath) except RuntimeError: ### test failed window pass @@ -162,13 +162,16 @@ class XCustomWindow (InstallWindow): self.display_desktop_pixmap(desktop) # XCustomWindow tag="xcustom" - def getScreen (self, xconfig, monitor, videocard, desktop, comps): + def getScreen (self, xconfig, monitor, videocard, desktop, comps, + instPath): self.xconfig = xconfig self.monitor = monitor self.videocard = videocard self.desktop = desktop + self.instPath = instPath + # create toplevel packing structure self.box = gtk.VBox (gtk.FALSE) self.box.set_border_width (5) diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py index 8bd9f7112..11a3a039c 100644 --- a/textw/xconfig_text.py +++ b/textw/xconfig_text.py @@ -63,7 +63,7 @@ class XCustomWindow: self.xconfig.setManualModes(newmodes) try: - self.xconfig.test (root="/mnt/sysimage") + self.xconfig.test (root=self.instPath) except RuntimeError: ### test failed window pass @@ -88,7 +88,8 @@ class XCustomWindow: print "Invalid widget in xconfig_text::desktopCB" - def __call__(self, screen, xconfig, monitor, videocard, desktop, comps): + def __call__(self, screen, xconfig, monitor, videocard, desktop, comps, + instPath): def numCompare (first, second): first = string.atoi (first) @@ -100,6 +101,7 @@ class XCustomWindow: return 0 self.xconfig = xconfig + self.instPath = instPath depth_list = [(_("256 Colors (8 Bit)")), (_("High Color (16 Bit)")), (_("True Color (24 Bit)"))] self.bit_depth = ["8", "16", "32"] |