From: marko Date: Sat, 18 Aug 2007 18:41:43 +0000 (+0000) Subject: Add support for storing ospf6 config and starting up the X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=39ca9bd77612af95acad37c6d958485082f3cc0b;p=imunes.git 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 bdf1b29..76ab57d 100755 --- 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 9e02a63..05427a4 100755 --- 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 bb966cb..5b7febc 100755 --- 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