diff options
| author | Matt Wilson <msw@redhat.com> | 1999-09-22 06:08:21 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-09-22 06:08:21 +0000 |
| commit | a5a190c37d15fa8ab0358c75ee3c19eff9eab3af (patch) | |
| tree | 5f06da39e2dd4cf31028b99e93ac967179b4bc2d /iw | |
| parent | 3bf44a446bf6183f644ce864f17586716939db49 (diff) | |
| download | anaconda-a5a190c37d15fa8ab0358c75ee3c19eff9eab3af.tar.gz anaconda-a5a190c37d15fa8ab0358c75ee3c19eff9eab3af.tar.xz anaconda-a5a190c37d15fa8ab0358c75ee3c19eff9eab3af.zip | |
merge from jj
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/installpath.py | 10 | ||||
| -rw-r--r-- | iw/network.py | 8 | ||||
| -rw-r--r-- | iw/timezone.py | 3 |
3 files changed, 17 insertions, 4 deletions
diff --git a/iw/installpath.py b/iw/installpath.py index 530c36a5e..d58b12999 100644 --- a/iw/installpath.py +++ b/iw/installpath.py @@ -13,6 +13,7 @@ from format import * from congrats import * from dependencies import * from lilo import * +from silo import * from examine import * from bootdisk import * from timezone import * @@ -20,6 +21,7 @@ from xconfig import * from fdisk import * from rootpartition import * from confirm import * +import iutil from gui import _ import installclass @@ -65,6 +67,14 @@ class InstallPathWindow (InstallWindow): ] def __init__ (self, ics): + if iutil.getArch() == 'sparc': + for i in range(len(self.installSteps)): + if type(self.installSteps[i]) == type((1,)): + (x, string) = self.installSteps[i] + if string == 'lilo': + self.installSteps[i] = ( SiloWindow, "silo" ) + break + InstallWindow.__init__ (self, ics) ics.readHTML ("instpath") diff --git a/iw/network.py b/iw/network.py index b332976e5..a541e9ee9 100644 --- a/iw/network.py +++ b/iw/network.py @@ -113,7 +113,11 @@ class NetworkWindow (InstallWindow): if (new_nm != nm.get_text ()): nm.set_text (new_nm) - def DHCPtoggled (self, widget, table): + def DHCPtoggled (self, widget, (dev, table)): + if widget.get_active (): + dev.set (("bootproto", "dhcp")) + else: + dev.set (("bootproto", "static")) table.set_sensitive (not widget.get_active ()) self.ipTable.set_sensitive (not widget.get_active ()) @@ -147,7 +151,7 @@ class NetworkWindow (InstallWindow): options = [_("IP Address"), _("Netmask"), _("Network"), _("Broadcast")] ipTable = GtkTable (len (options), 2) - DHCPcb.connect ("toggled", self.DHCPtoggled, ipTable) + DHCPcb.connect ("toggled", self.DHCPtoggled, (devs[i], ipTable)) forward = lambda widget, box=box: box.focus (DIR_TAB_FORWARD) diff --git a/iw/timezone.py b/iw/timezone.py index 847b51b48..8f8b6673f 100644 --- a/iw/timezone.py +++ b/iw/timezone.py @@ -29,7 +29,6 @@ class TimezoneWindow (InstallWindow): ics.setTitle (_("Time Zone Selection")) ics.setNextEnabled (1) ics.readHTML ("timezone") -## ics.setHTML ("<HTML><BODY>Select your current location</BODY></HTML>") self.timeZones = ("-12:00", "-11:00", @@ -91,7 +90,7 @@ class TimezoneWindow (InstallWindow): nb = GtkNotebook () mainBox = GtkVBox (FALSE, 5) - + tz = timezonemap.new (path) self.tz = tz map = Map (tz.map) |