git://git.onelab.eu
/
pyplnet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df81e93
)
Use an incrementer instead of something based on the name.
author
Daniel Hokka Zakrisson
<dhokka@cs.princeton.edu>
Wed, 9 Feb 2011 18:30:51 +0000
(13:30 -0500)
committer
Daniel Hokka Zakrisson
<dhokka@cs.princeton.edu>
Wed, 9 Feb 2011 18:30:51 +0000
(13:30 -0500)
plnet.py
patch
|
blob
|
history
diff --git
a/plnet.py
b/plnet.py
index
c4cd5fc
..
a99add8
100755
(executable)
--- a/
plnet.py
+++ b/
plnet.py
@@
-256,6
+256,7
@@
def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
# Process ifcfg-$dev changes / additions
newdevs = []
# 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")
for (dev, details) in devices_map.iteritems():
(fd, tmpnam) = tempfile.mkstemp(dir=sysconfig)
f = os.fdopen(fd, "w")
@@
-302,10
+303,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'] != ''):
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)
(fd, rule_tmpnam) = tempfile.mkstemp(dir=sysconfig)
os.write(fd, "from %s lookup %d\n" % (details['IPADDR'], table))
os.close(fd)