Add support for storing ospf6 config and starting up the

ospf6d daemon of quagga suite.

Bug found by:
Submitted by:
Reviewed by:
Approved by:
Obtained from:

diff --git a/exec.tcl b/exec.tcl
index bdf1b290968c3c69a2a9b0c059cd8bc1038b8015..76ab57dde83dc245e5f1975417541423acf41839 100755 (executable)
--- a/exec.tcl
+++ b/exec.tcl
@@ -1,4 +1,4 @@
-# $Id: exec.tcl,v 1.53 2007/08/14 20:54:03 marko Exp $
+# $Id: exec.tcl,v 1.54 2007/08/18 18:41:43 marko Exp $
 
 # Copyright 2004, 2005 University of Zagreb, Croatia.  All rights reserved.
 #
@@ -568,7 +568,7 @@ proc deployCfg {} {
     nexec rm -f /usr/local/etc/quagga/Quagga.conf
     catch { nexec ln -s /tmp/@ /var/run/quagga }
     catch { nexec ln -s /tmp/@/boot.conf /usr/local/etc/quagga/Quagga.conf }
-    foreach file { bgpd ospfd ripd ripngd vtysh zebra } {
+    foreach file { bgpd ospfd ospf6d ripd ripngd vtysh zebra } {
        catch { nexec cp /dev/null /usr/local/etc/quagga/$file.conf }
     }
 

diff --git a/quagga.tcl b/quagga.tcl
index 9e02a639d75b712b610bc69736c67efedf9409b8..05427a462bec72a055886122a779eeacfa1607cc 100755 (executable)
--- a/quagga.tcl
+++ b/quagga.tcl
@@ -1,4 +1,4 @@
-# $Id: quagga.tcl,v 1.18 2007/08/13 07:12:06 marko Exp $ 
+# $Id: quagga.tcl,v 1.19 2007/08/18 18:41:43 marko Exp $ 
 #
 # Copyright 2005 University of Zagreb, Croatia.  All rights reserved.
 #
@@ -109,7 +109,7 @@ proc $MODULE.cfggen { node } {
        lappend cfg "!"
     }
 
-    foreach proto { rip ripng ospf bgp } {
+    foreach proto { rip ripng ospf ospf6 bgp } {
        set protocfg [netconfFetchSection $node "router $proto"]
        if { $protocfg != "" } {
            lappend cfg "router $proto"

diff --git a/quaggaboot.sh b/quaggaboot.sh
index bb966cbeaa40a93d076051895298af238df8d3c3..5b7febc36694373d4a3fe58a668afa363ea8fae3 100755 (executable)
--- a/quaggaboot.sh
+++ b/quaggaboot.sh
@@ -2,7 +2,7 @@
 
 zebra -dP0
 
-for f in rip ripng ospf bgp; do
+for f in rip ripng ospf ospf6 bgp; do
     fgrep -q "router $f" $1 && ${f}d -dP0 
 done