X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=abfeb375cd002f35090cf3838f8601bbe5b43bdf;hb=ff4f3eff4f870d1d26f5c7f14f45bbcef08e6340;hp=84b0791102046c1b719f5b312626669452702233;hpb=63f646c938175cdfe45a775f909424c5de838556;p=pyplnet.git diff --git a/plnet.py b/plnet.py index 84b0791..abfeb37 100755 --- a/plnet.py +++ b/plnet.py @@ -85,10 +85,12 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa inter['BOOTPROTO'] = "static" inter['IPADDR'] = network['ip'] inter['NETMASK'] = network['netmask'] - inter['DNS1'] = network['dns1'] - inter['DNS2'] = network['dns2'] if network['is_primary']: gateway = network['gateway'] + if network['dns1']: + inter['DNS1'] = network['dns1'] + if network['dns2']: + inter['DNS2'] = network['dns2'] elif network['method'] == "dhcp": inter['BOOTPROTO'] = "dhcp" @@ -156,7 +158,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa (inter['IFNAME'],hwifname)) inter['IFNAME'] = hwifname else: - logger.log('net:InitInterfaces WARNING: mac addr %s for alias not found' %(hwaddr,alias)) + logger.log('net:InitInterfaces WARNING: mac addr %s for alias not found' %(hwaddr)) if 'IFNAME' in inter: # stupid RH /etc/sysconfig/network-scripts/ifup-aliases:new_interface()