Merge "Revert "Point DHCP gateway to default gateway""

This commit is contained in:
Jenkins 2016-06-14 08:01:14 +00:00 committed by Gerrit Code Review
commit 668fb1dcbd
1 changed files with 2 additions and 8 deletions

View File

@ -511,14 +511,8 @@ interface first.")
elif key == "ADMIN_NETWORK/dhcp_pool_end":
self.edits[index].set_edit_text(dynamic_end)
elif key == "ADMIN_NETWORK/dhcp_gateway":
gw = self.get_default_gateway_linux()
if network.inSameSubnet(
gw, dynamic_start,
self.netsettings[self.activeiface]['netmask']):
dhcp_gateway = gw
else:
dhcp_gateway = self.netsettings[self.activeiface]['addr']
self.edits[index].set_edit_text(dhcp_gateway)
self.edits[index].set_edit_text(self.netsettings[
self.activeiface]['addr'])
def refresh(self):
self.getNetwork()