X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=76e13073b670ee2d1b85cf866716211bdb988da8;hb=292045f14ff8b50814c61b706a4c6cf37bb7e576;hp=c4cd5fc27b3e7ecc140d83f6218d28c15eb24b07;hpb=df81e9330b804cfe8df393c25f3e0c406697ea35;p=pyplnet.git

diff --git a/plnet.py b/plnet.py
index c4cd5fc..76e1307 100755
--- a/plnet.py
+++ b/plnet.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python /usr/bin/plcsh
-# $Id$
 
 import os
 import socket
@@ -44,7 +43,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
     failedToGetSettings = False
 
     # NOTE: GetInterfaces/NodeNetworks does not necessarily order the interfaces
-    # returned.  Because 'interface'is decremented as each interface is processed,
+    # returned.  Because 'interface' is decremented as each interface is processed,
     # by the time is_primary=True (primary) interface is reached, the device
     # "eth%s" % interface, is not eth0.  But, something like eth-4, or eth-12.
     # This code sorts the interfaces, placing is_primary=True interfaces first.  
@@ -256,6 +255,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
 
     # Process ifcfg-$dev changes / additions
     newdevs = []
+    table = 10
     for (dev, details) in devices_map.iteritems():
         (fd, tmpnam) = tempfile.mkstemp(dir=sysconfig)
         f = os.fdopen(fd, "w")
@@ -267,7 +267,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
         # print the configuration values
         for (key, val) in details.iteritems():
             if key not in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER','GATEWAY'):
-                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 details:
@@ -302,10 +302,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
         src_route_changed = False
         if ('PRIMARY' not in details and 'GATEWAY' in details and
             details['GATEWAY'] != ''):
-            i = len(dev) - 1
-            while dev[i - 1].isdigit():
-                i -= 1
-            table = 10 + int(dev[i:])
+            table += 1
             (fd, rule_tmpnam) = tempfile.mkstemp(dir=sysconfig)
             os.write(fd, "from %s lookup %d\n" % (details['IPADDR'], table))
             os.close(fd)