Attachment 310577 Details for Bug 452664 – Adam Stokes' patch updated with one more pumpNetDevice call replacement

[patch] Adam Stokes' patch updated with one more pumpNetDevice call replacement

0001-Regression-caused-by-435978-fixed-452664.patch (text/plain), 1.34 KB, created by Radek Vykydal on 2008-06-30 12:49:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Vykydal

Created: 2008-06-30 12:49:53 UTC

Size: 1.34 KB

patch

obsolete

>From 4e0e00c909c2823c144aab5ab63183d22bad38f5 Mon Sep 17 00:00:00 2001
>From: Radek Vykydal <rvykydal@redhat.com>
>Date: Mon, 30 Jun 2008 14:03:08 +0200
>Subject: [PATCH] Regression caused by #435978 fixed (#452664).
>
>Call dhcpNetDevice() instead of pumpNetDevice() which
>used to wrap the former and was removed in #435978.
>---
> command-stubs/pump-stub |    2 +-
> network.py              |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/command-stubs/pump-stub b/command-stubs/pump-stub
>index 63f093b..e1c0685 100755
>--- a/command-stubs/pump-stub
>+++ b/command-stubs/pump-stub
>@@ -27,7 +27,7 @@ while (argv):
>     else:
> 	usage()
> 	
>-ns = isys.pumpNetDevice(iface, None)
>+ns = isys.dhcpNetDevice(iface, None)
> if ns:
>     f = open("/etc/resolv.conf", "w")
>     f.write("nameserver %s\n" % ns)
>diff --git a/network.py b/network.py
>index ff44fcf..5c42520 100644
>--- a/network.py
>+++ b/network.py
>@@ -338,7 +338,7 @@ class Network:
> 	    for dev in self.netdevices.values():
>                 if (dev.get('bootproto').lower() == "dhcp" and
>                     dev.get('onboot') == "yes"):
>-		    ret = isys.pumpNetDevice(dev.get('device'), dev.get('dhcpclass'))
>+		    ret = isys.dhcpNetDevice(dev.get('device'), dev.get('dhcpclass'))
>                     if ret is None:
>                         continue
>                     myns = ret
>-- 
>1.5.4.1
>

Actions: View | Diff

Attachments on bug 452664: 310133 | 310577