saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #38612 from sjorge/2016.11-solaris-ifacestartswith

Browse source 
network.ifacestartswith throws exception on Solaris-like platforms
This commit is contained in:
Mike Place 2017-01-06 10:20:31 -07:00 • committed by GitHub
commit f64e003a69
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/network.py
View file

@ -1489,7 +1489,10 @@ def ifacestartswith(cidr):
if 'inet' in ifval:
for inet in ifval['inet']:
if inet['address'][0:size] == pattern:
intfnames.append(inet['label'])
if 'label' in inet:
intfnames.append(inet['label'])
else:
intfnames.append(ifname)
return intfnames