X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=ee3d253f280aa097f5b0762edd9edcd62686acbc;hb=712ca0a3e915adbb8bc539756d0cf8af1d755575;hp=9150a1875cdf5b5a6e6d34ba826cbfeef085c793;hpb=3605426e831d192b0d8b4540a9fda2c959e132e5;p=pyplnet.git

diff --git a/plnet.py b/plnet.py
index 9150a18..ee3d253 100755
--- a/plnet.py
+++ b/plnet.py
@@ -5,12 +5,18 @@ import os
 import socket
 import time
 import tempfile
+import errno
 
 import sioc
 import modprobe
 
 def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeManager"):
     sysconfig = "%s/etc/sysconfig/network-scripts" % root
+    try:
+        os.makedirs(sysconfig)
+    except OSError, e:
+        if e.errno != errno.EEXIST:
+            raise e
 
     # query running network interfaces
     devs = sioc.gifconf()
@@ -56,6 +62,8 @@ 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']
 
@@ -187,7 +195,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
         time.sleep(2)
 
     # Write network configuration file
-    networkconf = file("%s/etc/sysconfig/network", "w")
+    networkconf = file("%s/etc/sysconfig/network" % root, "w")
     networkconf.write("NETWORKING=yes\nHOSTNAME=%s\n" % hostname)
     if gateway is not None:
         networkconf.write("GATEWAY=%s\n" % gateway)
@@ -201,12 +209,12 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
         f.write("# Autogenerated by pyplnet... do not edit!\n")
         if 'DRIVER' in inter:
             f.write("# using %s driver for device %s\n" % (inter['DRIVER'],dev))
-        f.write('DEVICE="%s"\n' % dev)
+        f.write('DEVICE=%s\n' % dev)
         
         # print the configuration values
         for (key, val) in inter.iteritems():
             if key not in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER'):
-                f.write('%s="%s"\n' % (key, val))
+                f.write('%s=%s\n' % (key, val))
 
         # print the configuration specific option values (if any)
         if 'CFGOPTIONS' in inter: