Changeset b3125fa1 for fedd/federation

Timestamp:

Feb 7, 2014 4:29:20 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

ae714e4

Parents:

5f5ce09

Message:

Read external nets

File:

• fedd/federation/desktop_access.py (modified) (3 diffs)

fedd/federation/desktop_access.py

@@ -398 +398 @@
                     my_addr
             # self.set_route('10.0.0.0/8', f, exp_peer)
-            print >>f, '/usr/local/sbin/zebra -d -i /var/run/zebra.pid -f %s' % zebra_conf
-            print >>f, '/usr/local/sbin/ospfd -d -i /var/run/ospfd.pid -f %s' % ospfd_conf
+            print >>f, '/usr/local/sbin/zebra -d -f %s' % zebra_conf
+            print >>f, '/usr/local/sbin/ospfd -d -f %s' % ospfd_conf
             f.close()
             os.chmod(cscript, 0755)
@@ -408 +408 @@
             #self.unset_route('10.0.0.0/8', f)
             print >>f, 'mv /etc/hosts.DETER.fedd.hold /etc/hosts'
-            print >>f, 'kill `cat /var/run/ospfd.pid`'
-            print >>f, 'kill `cat /var/run/zebra.pid`'
+            print >>f, 'kill `cat /var/run/quagga/ospfd.pid`'
+            print >>f, 'kill `cat /var/run/quagga/zebra.pid`'
             f.close()
             os.chmod(dscript, 0755)
@@ -415 +415 @@
             print >>f, 'hostname %s' % my_name
             print >>f, 'interface tap0'
+            try:
+                extern = open(os.path.join(self.localdir, 
+                    'external_networks'), 'r')
+                if extern is not None:
+                    for l in extern:
+                        print >>f, "%s" % l.strip()
+                    extern.close()
+            except EnvironmentError:
+                # No external_networks or problem reading it, ignore
+                pass
             f.close()
             os.chmod(zebra_conf, 0644)