diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-05-30 18:37:40 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-05-30 18:37:40 +0000 |
| commit | d6ab17a42c932fa77919ba11aa73f09bfc715761 (patch) | |
| tree | f0280851561d310603846bdfdfb66b90f21c12bf /iw/netconfig_dialog.py | |
| parent | bc0ab0a4e273708468c80d95ea9c9eab024797d6 (diff) | |
| download | anaconda-d6ab17a42c932fa77919ba11aa73f09bfc715761.tar.gz anaconda-d6ab17a42c932fa77919ba11aa73f09bfc715761.tar.xz anaconda-d6ab17a42c932fa77919ba11aa73f09bfc715761.zip | |
(merges from f7-branch)
2007-05-30 Jeremy Katz <katzj@aglarond.local>
* isys/isys.py (_stopRaid): Fix raidstop. I have no clue how
things were working here...
* isys/isys.py (_getRaidInfo): raise ValueError when we don't find
a valid raid superblock (#151653).
* upgrade.py: More blacklist
* isys/isys.h (EARLY_SWAP_RAM): Let's bump RAM needs a little (#232862)
* iw/netconfig_dialog.py (NetworkConfigurator._handleIPError): Add
a frame so things look right
(NetworkConfigurator._ok): Set useipv4 to true, call netconfig
methods with the right args (#240804)
* network.py (hasActiveNetDev): Ensure we have an IP as
otherwise, the network device isn't really all that active.
Diffstat (limited to 'iw/netconfig_dialog.py')
| -rw-r--r-- | iw/netconfig_dialog.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/iw/netconfig_dialog.py b/iw/netconfig_dialog.py index 10783e957..55852fe9c 100644 --- a/iw/netconfig_dialog.py +++ b/iw/netconfig_dialog.py @@ -132,10 +132,12 @@ class NetworkConfigurator: self.window.destroy() def _handleIPError(self, field, errmsg): - d = gtk.MessageDialog(_("Error With Data"), 0, gtk.MESSAGE_ERROR, + d = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("An error occurred converting the value " "entered for \"%s\":\n%s") %(field, errmsg)) + d.set_title(_("Error With Data")) + gui.addFrame(d) d.run() d.destroy() @@ -149,13 +151,15 @@ class NetworkConfigurator: val = combo.get_model().get_value(active, 1) netdev = self.network.available()[val] + netdev.set(('useipv4', True)) + # FIXME: need to do input validation if self.xml.get_widget("dhcpCheckbutton").get_active(): self.window.hide() w = gui.WaitWindow(_("Dynamic IP"), _("Sending request for IP information " "for %s...") %(netdev.get("device"))) - ns = isys.dhcpNetDevice(netdev.get("device")) + ns = isys.dhcpNetDevice(netdev) w.pop() if ns is not None: self.rc = gtk.RESPONSE_OK @@ -172,12 +176,14 @@ class NetworkConfigurator: try: network.sanityCheckIPString(ipv4addr) + netdev.set(('ipaddr', ipv4addr)) except network.IPError, msg: self._handleIPError(_("IP Address"), msg) return try: network.sanityCheckIPString(ipv4nm) + netdev.set(('netmask', ipv4nm)) except network.IPError, msg: self._handleIPError(_("Netmask"), msg) return @@ -197,8 +203,7 @@ class NetworkConfigurator: try: - isys.configNetDevice(netdev.get("device"), - ipv4addr, ipv4nm, gateway) + isys.configNetDevice(netdev, gateway) except Exception, e: log.error("Error configuring network device: %s" %(e,)) self.rc = gtk.RESPONSE_OK |