Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-quagga into jenner

7 files changed, 44 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index e3f0b8f3..4f20af9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+vyatta-cfg-quagga (0.17) unstable; urgency=low
+
+  [ root ]
+  * Initial commit of config commands for ospfv3
+
+  [ slioch ]
+  * as per discussion with Stephen. update handles shutdown of daemon
+    and explicit stop is not needed. Removed from
+
+  [ Stephen Hemminger ]
+  * Add quagga parameters for bridge and bonding devices
+
+  [ Stig Thormodsrud ]
+  * Make sure to quote $VAR(@) usage.
+
+  [ Stephen Hemminger ]
+  * Start BGP on create
+  * Use multi-line create on ospf
+  * Start ripngd on create
+  * Use multi-line in one create node
+  * OSPFv3 start ospf6d
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Wed, 25 Feb 2009 10:23:26 -0800
+
 vyatta-cfg-quagga (0.16) unstable; urgency=low
 
   [ Stephen Hemminger ]
diff --git a/scripts/vyatta-show-protocols b/scripts/vyatta-show-protocols
index c81dcb82..4f3e0a92 100755
--- a/scripts/vyatta-show-protocols
+++ b/scripts/vyatta-show-protocols
@@ -31,7 +31,14 @@ my %actions = (
     'deleted'	 => 'isDeleted',
 );
 
-my @protocols = qw(bgp isis ospf ospf6 rip ripng);
+my %daemons = (
+    'bgp'	=> 'bgpd',
+    'ospf'	=> 'ospfd',
+    'ospfv3'	=> 'ospf6d',
+    'rip'	=> 'ripd',
+    'ripng'	=> 'ripngd',
+    'isis'	=> 'isisd',
+);
 
 sub usage {
     die "Usage: $0 {",join('|',keys %actions),"}\n"
@@ -44,8 +51,7 @@ usage unless $match;
 my $config = new Vyatta::Config;
 $config->setLevel('protocols');
     
-# Avoid the urge to do Perl Golf here...
-my @found = grep { $config->$match($_) } @protocols;
-my @daemons = map { $_ . 'd' } @found;
-print join(' ', @daemons), "\n";
+# Should have avoided the urge to do Perl golf here...
+my @found = grep { $config->$match($_) } keys %daemons;
+print join(' ', map { $daemons{$_} } @found),"\n";
 
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
index 91d7261b..7f7e393f 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -5,7 +5,7 @@ comp_help: \1  <1-4294967294>\tAS number
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \
 		   "AS number must be between 1 and 4294967294"
 create: sudo /opt/vyatta/sbin/quagga-manager start bgpd
-update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)"
+        vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)"
 # we need to set default parameters in BGP here since we can't do it in
 # startup scripts as we don't know the AS number at that point
 update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" \
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index 1fd39bfe..dfae4396 100644
--- a/templates/protocols/ospf/node.def
+++ b/templates/protocols/ospf/node.def
@@ -1,5 +1,5 @@
 help: Configure Open Shortest Path First protocol (OSPF) parameters
 create:  sudo /opt/vyatta/sbin/quagga-manager start ospfd
-create: vyatta-vtysh -c "configure terminal" -c "router ospf"
+         vyatta-vtysh -c "configure terminal" -c "router ospf"
 delete: vyatta-vtysh -c "configure terminal" -c "no router ospf"
 end:  sudo /opt/vyatta/sbin/quagga-manager update
diff --git a/templates/protocols/ospfv3/node.def b/templates/protocols/ospfv3/node.def
index 65963f46..3cdcd17e 100644
--- a/templates/protocols/ospfv3/node.def
+++ b/templates/protocols/ospfv3/node.def
@@ -1,5 +1,5 @@
 help: Configure IPv6 Open Shortest Path First protocol (OSPFv3) parameters
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
-       -c \"router ospf6\" "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-       -c \"no router ospf6\" "
+create:  sudo /opt/vyatta/sbin/quagga-manager start ospf6d
+       vyatta-vtysh -c configure terminal" -c "router ospf6"
+delete:vyatta-vtysh -c "configure terminal" -c "no router ospf6"
+end:  sudo /opt/vyatta/sbin/quagga-manager update
diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def
index 648ecf49..31f915c1 100644
--- a/templates/protocols/rip/node.def
+++ b/templates/protocols/rip/node.def
@@ -1,5 +1,5 @@
 help: Configure Routing Information Protocol (RIP) parameters
 create: sudo /opt/vyatta/sbin/quagga-manager start ripd
-create: vyatta-vtysh -c "configure terminal" -c "router rip"
+        vyatta-vtysh -c "configure terminal" -c "router rip"
 delete: vyatta-vtysh -c "configure terminal" -c "no router rip"
 end: sudo /opt/vyatta/sbin/quagga-manager update
diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def
index a4c4c9d4..9b0d1f5b 100644
--- a/templates/protocols/ripng/node.def
+++ b/templates/protocols/ripng/node.def
@@ -1,5 +1,5 @@
 help: Configure Routing Information Protocol (RIPng) parameters
-begin:  sudo /opt/vyatta/sbin/quagga-manager start ripngd
-create: vyatta-vtysh -c "configure terminal" -c "router ripng"
+create:  sudo /opt/vyatta/sbin/quagga-manager start ripngd
+         vyatta-vtysh -c "configure terminal" -c "router ripng"
 delete: vyatta-vtysh -c "configure terminal" -c "no router ripng"
 end:	sudo /opt/vyatta/sbin/quagga-manager update