mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

Detect and ignore the ether keyword in /etc/network/interface

Browse Source 
Current supported syntax: "hwaddress [ether] 01:02:03:04:05:06"

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-03-15 15:41:04 +01:00
parent 69cbf895be
commit d60b92a59f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
addons/address.py
View File

@@ -73,8 +73,14 @@ class address(moduleBase):
return True
return False
def _process_bridge(self, ifaceobj, up):
def _get_hwaddress(self, ifaceobj):
hwaddress = ifaceobj.get_attr_value_first('hwaddress')
if hwaddress and hwaddress.startswith("ether"):
hwaddress = hwaddress[5:].strip()
return hwaddress
def _process_bridge(self, ifaceobj, up):
hwaddress = self._get_hwaddress(ifaceobj)
addrs = ifaceobj.get_attr_value_first('address')
is_vlan_dev_on_vlan_aware_bridge = False
is_bridge = self.ipcmd.is_bridge(ifaceobj.name)
@@ -183,7 +189,9 @@ class address(moduleBase):
alias = ifaceobj.get_attr_value_first('alias')
if alias:
self.ipcmd.link_set_alias(ifaceobj.name, alias)
hwaddress = ifaceobj.get_attr_value_first('hwaddress')
self.ipcmd.batch_commit()
hwaddress = self._get_hwaddress(ifaceobj)
if hwaddress:
self.ipcmd.link_set(ifaceobj.name, 'address', hwaddress)
self.ipcmd.batch_commit()
@@ -264,7 +272,7 @@ class address(moduleBase):
addr_method = ifaceobj.addr_method
self.query_n_update_ifaceobjcurr_attr(ifaceobj, ifaceobjcurr,
'mtu', self.ipcmd.link_get_mtu)
hwaddress = ifaceobj.get_attr_value_first('hwaddress')
hwaddress = self._get_hwaddress(ifaceobj)
if hwaddress:
rhwaddress = self.ipcmd.link_get_hwaddress(ifaceobj.name)
if not rhwaddress or rhwaddress != hwaddress: