Merge "check networkd files"

This commit is contained in:
Zuul 2018-12-19 04:48:56 +00:00 committed by Gerrit Code Review
commit 8ca30bdec8
1 changed files with 7 additions and 1 deletions

View File

@ -540,7 +540,7 @@ def write_networkd_interfaces(interfaces, sys_interfaces):
for mac, iname in sorted(
sys_interfaces.items(), key=lambda x: x[1]):
if _exists_gentoo_interface(iname):
if _exists_networkd_interface(iname):
# This interface already has a config file, move on
log.debug("%s already has config file, skipping" % iname)
continue
@ -600,6 +600,12 @@ def write_networkd_interfaces(interfaces, sys_interfaces):
return files_to_write
def _exists_networkd_interface(name):
network_file = '/etc/systemd/network/{name}.network'.format(name=name)
netdev_file = '/etc/systemd/network/{name}.netdev'.format(name=name)
return (os.path.exists(network_file) or os.path.exists(netdev_file))
def _exists_gentoo_interface(name):
file_to_check = '/etc/conf.d/net.{name}'.format(name=name)
return os.path.exists(file_to_check)