From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Wed, 9 Feb 2011 18:30:58 +0000 (-0500)
Subject: Merge branch 'master' of dhozac@git.planet-lab.org:/git/pyplnet
X-Git-Tag: pyplnet-4.3-9~1
X-Git-Url: http://git.onelab.eu/?p=pyplnet.git;a=commitdiff_plain;h=04b1025cd00af3ecf4b0a7b49c849ca9e93cf8b9;hp=b6b71094bb22b2ae358fb6e65396df9b151c3cdc

Merge branch 'master' of dhozac@git.planet-lab.org:/git/pyplnet
---

diff --git a/plnet.py b/plnet.py
index 129e5ba..76e1307 100755
--- a/plnet.py
+++ b/plnet.py
@@ -255,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")
@@ -301,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)