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

Misc fixes. Add a --skip-upperifaces option to ifup (given the confusion

over ifup handling of upperifaces by default) + some fixes in the
reserved vlan check

Ticket: CM-3346
Reviewed By:
Testing Done: Tested ifupdown sanity.
This commit is contained in:
Roopa Prabhu
2014-11-25 10:19:35 -08:00
parent aa5751ba27
commit ad25e7bb98
5 changed files with 37 additions and 9 deletions

View File

@@ -325,7 +325,9 @@ class moduleBase(object):
start = end = 0
get_resvvlan = '/usr/share/python-ifupdown2/get_reserved_vlan_range.sh'
try:
(start, end) = self.exec_command(get_resvvlan).split('-')
(s, e) = self.exec_command(get_resvvlan).strip('\n').split('-')
start = int(s)
end = int(e)
except:
# ignore errors
pass