X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=c4202036e92c2eae23f206cf137ab78745425dc0;hb=89e957e8d10374704225ec04357a067aa350c4d6;hp=272fa0020a65c12f8aa8243fdf799e4daf58ad5e;hpb=c096416c7aa9d4a66f4a4039ecb3daa05d151181;p=pyplnet.git

diff --git a/plnet.py b/plnet.py
index 272fa00..c420203 100755
--- a/plnet.py
+++ b/plnet.py
@@ -9,7 +9,7 @@ import tempfile
 import sioc
 import modprobe
 
-def InitInterfaces(logger, plc, data, root="", files_only=False):
+def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeManager"):
     sysconfig = "%s/etc/sysconfig/network-scripts" % root
 
     # query running network interfaces
@@ -56,6 +56,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False):
 
         elif network['method'] == "dhcp":
             inter['BOOTPROTO'] = "dhcp"
+            inter['PERSISTENT_DHCLIENT'] = "yes"
             if network['hostname']:
                 inter['DHCP_HOSTNAME'] = network['hostname']
             else:
@@ -126,7 +127,10 @@ def InitInterfaces(logger, plc, data, root="", files_only=False):
             interfaces[ifname] = inter
                 
     m = modprobe.Modprobe()
-    m.input("%s/etc/modprobe.conf" % root)
+    try:
+        m.input("%s/etc/modprobe.conf" % root, program)
+    except:
+        pass
     for (dev, inter) in interfaces.iteritems():
         # get the driver string "moduleName option1=a option2=b"
         driver=inter.get('DRIVER','')
@@ -286,16 +290,18 @@ if __name__ == "__main__":
     import optparse
     import sys
 
-    parser = optparse.OptionParser()
+    parser = optparse.OptionParser(usage="plnet [-v] [-f] [-p <program>] -r root node_id")
     parser.add_option("-v", "--verbose", action="store_true", dest="verbose")
     parser.add_option("-r", "--root", action="store", type="string",
                       dest="root", default=None)
     parser.add_option("-f", "--files-only", action="store_true",
                       dest="files_only")
+    parser.add_option("-p", "--program", action="store", type="string",
+                      dest="program", default="plnet")
     (options, args) = parser.parse_args()
     if len(args) != 1 or options.root is None:
-        print >>sys.stderr, \
-            "Usage: %s [-v] [-f] -r <root> node_id" % sys.argv[0]
+        print >>sys.stderr, "Missing root or node_id"
+        parser.print_help()
         sys.exit(1)
 
     node = shell.GetNodes({'node_id': [int(args[0])]})