Merge "Revert "Point DHCP gateway to default gateway""
This commit is contained in:
commit
668fb1dcbd
@ -511,14 +511,8 @@ interface first.")
|
|||||||
elif key == "ADMIN_NETWORK/dhcp_pool_end":
|
elif key == "ADMIN_NETWORK/dhcp_pool_end":
|
||||||
self.edits[index].set_edit_text(dynamic_end)
|
self.edits[index].set_edit_text(dynamic_end)
|
||||||
elif key == "ADMIN_NETWORK/dhcp_gateway":
|
elif key == "ADMIN_NETWORK/dhcp_gateway":
|
||||||
gw = self.get_default_gateway_linux()
|
self.edits[index].set_edit_text(self.netsettings[
|
||||||
if network.inSameSubnet(
|
self.activeiface]['addr'])
|
||||||
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)
|
|
||||||
|
|
||||||
def refresh(self):
|
def refresh(self):
|
||||||
self.getNetwork()
|
self.getNetwork()
|
||||||
|
Loading…
Reference in New Issue
Block a user