gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-09 07:14:13 +01:00
Code Issues Projects Releases Wiki Activity

Add possibility to pass extra arguments to the DHCP client commands, and use this option when a global DNS server has been set, to avoid resolv.conf being overwritten by the DHCP client when receiving a DHCP reply that contains a DNS server.

Browse Source 
This should fix https://bugs.launchpad.net/wicd/+bug/145405.
Credits for the original patch go to "Leonardo" :-)

Plus, translations...
This commit is contained in:
Tom Van Braeckel
2015-02-14 11:44:03 +01:00
parent 29c12dc0d2 d7787f9068
commit be575c21df
63 changed files with 149 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wicd/networking.py
View File

@@ -476,7 +476,13 @@ class ConnectThread(threading.Thread):
else:
hname = None
print "Running DHCP with NO hostname"
dhcp_status = iface.StartDHCP(hname)
# Check if a global DNS is configured. If it is, then let the DHCP know *not* to update resolv.conf
staticdns = False
if self.network.get('use_global_dns') or (self.network.get('use_static_dns') and (self.network.get('dns1') or self.network.get('dns2') or self.network.get('dns3'))):
staticdns = True
dhcp_status = iface.StartDHCP(hname, staticdns)
if dhcp_status in ['no_dhcp_offers', 'dhcp_failed']:
if self.connect_result != "aborted":
self.abort_connection(dhcp_status)

31
wicd/wnettools.py
View File

@@ -296,7 +296,7 @@ class BaseInterface(object):
return path
def _get_dhcp_command(self, flavor=None, hostname=None):
def _get_dhcp_command(self, flavor=None, hostname=None, staticdns=False):
""" Returns the correct DHCP client command.
Given a type of DHCP request (create or release a lease),
@@ -333,26 +333,26 @@ class BaseInterface(object):
client_dict = {
"dhclient" :
{'connect' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s",
'connect_with_hostname' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s",
{'connect' : r"%(cmd)s -cf %(dhclientconf)s %(extra)s %(iface)s",
'connect_with_hostname' : r"%(cmd)s -cf %(dhclientconf)s %(extra)s %(iface)s",
'release' : r"%(cmd)s -r %(iface)s",
'id' : misc.DHCLIENT,
},
"pump" :
{ 'connect' : r"%(cmd)s -i %(iface)s",
'connect_with_hostname' : r"%(cmd)s -i %(iface)s -h %(hostname)s",
{ 'connect' : r"%(cmd)s -i %(iface)s %(extra)s",
'connect_with_hostname' : r"%(cmd)s -i %(iface)s -h %(hostname)s %(extra)s",
'release' : r"%(cmd)s -r -i %(iface)s",
'id' : misc.PUMP,
},
"dhcpcd" :
{'connect' : r"%(cmd)s --noipv4ll %(iface)s",
'connect_with_hostname' : r"%(cmd)s -h %(hostname)s --noipv4ll %(iface)s ",
{'connect' : r"%(cmd)s --noipv4ll %(extra)s %(iface)s",
'connect_with_hostname' : r"%(cmd)s -h %(hostname)s --noipv4ll %(extra)s %(iface)s ",
'release' : r"%(cmd)s -k %(iface)s",
'id' : misc.DHCPCD,
},
"udhcpc":
{'connect' : r"%(cmd)s -n -i %(iface)s",
'connect_with_hostname' : r"%(cmd)s -n -i %(iface)s -H %(hostname)s ",
{'connect' : r"%(cmd)s -n -i %(iface)s %(extra)s",
'connect_with_hostname' : r"%(cmd)s -n -i %(iface)s -H %(hostname)s %(extra)s",
'release' : r"killall -SIGUSR2 %(cmd)s",
'id' : misc.UDHCPC,
},
@@ -388,16 +388,25 @@ class BaseInterface(object):
return ""
if flavor == "connect":
# set up (optional) extra arguments to the dhcp client,
# used for disabling the resolv.conf update of dhcpd
extra_args = ""
if staticdns and client_name == "dhcpcd":
extra_args = "--nohook resolv.conf"
if hostname:
return client_dict[client_name]['connect_with_hostname'] % \
{ "cmd" : cmd,
"iface" : self.iface,
"hostname" : hostname,
'extra': extra_args,
'dhclientconf' : dhclient_conf_path }
else:
return client_dict[client_name]['connect'] % \
{ "cmd" : cmd,
"iface" : self.iface,
'extra': extra_args,
'dhclientconf' : dhclient_conf_path }
elif flavor == "release":
return client_dict[client_name]['release'] % \
@@ -655,7 +664,7 @@ class BaseInterface(object):
return 'dhcp_failed'
@neediface(False)
def StartDHCP(self, hostname):
def StartDHCP(self, hostname, staticdns):
""" Start the DHCP client to obtain an IP address.
Keyword Arguments:
@@ -666,7 +675,7 @@ class BaseInterface(object):
_check_dhcp_result for the possible values.
"""
cmd = self._get_dhcp_command('connect', hostname)
cmd = self._get_dhcp_command('connect', hostname, staticdns)
if self.verbose:
print cmd
self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True)