Start OSPF/RIP as needed during config

This only happens if link metrics set but OSPF/RIP not running yet.

39 files changed, 45 insertions, 1 deletions

diff --git a/scripts/quagga-manager b/scripts/quagga-manager
index c97b5ede..e7b5d5ae 100755
--- a/scripts/quagga-manager
+++ b/scripts/quagga-manager
@@ -7,7 +7,7 @@
 #echo $* | logger -p local7.debug -t quagga-manager
 
 usage() {
-    echo "Usage: $0 {start|stop|restart} {bgpd|ospfd|ripd|ripngd}"
+    echo "Usage: $0 {check|start|stop|restart} {bgpd|ospfd|ripd|ripngd}"
     exit 1
 }
 
@@ -23,6 +23,11 @@ fi
 pid_dir=/var/run/vyatta/quagga
 log_dir=/var/log/vyatta/quagga
 
+check() {
+    local daemon=$1
+    [  -f ${pid_dir}/${daemon}.pid ] || start $daemon
+}
+
 start() {
     local daemon=$1
     local exe_file=/usr/sbin/vyatta-$daemon
@@ -123,6 +128,7 @@ update() {
 
 
 case "$1" in
+    check)   check $2;;
     start)   start $2;;
     stop)    stop $2;;
     update)  update;;
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def
+++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/node.def
+++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def
+++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def
+++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def
+++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def
+++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/bonding/node.tag/ip/ospf/node.def b/templates/interfaces/bonding/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/bonding/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/bonding/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/bonding/node.tag/ip/rip/node.def b/templates/interfaces/bonding/node.tag/ip/rip/node.def
index d1f72a5f..b01a779f 100644
--- a/templates/interfaces/bonding/node.tag/ip/rip/node.def
+++ b/templates/interfaces/bonding/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/ip/ospf/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/ip/rip/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/ip/rip/node.def
index 793075b4..fd6064d5 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/ip/rip/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Inforamtion Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/bridge/node.tag/ip/ospf/node.def b/templates/interfaces/bridge/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/bridge/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/bridge/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/bridge/node.tag/ip/rip/node.def b/templates/interfaces/bridge/node.tag/ip/rip/node.def
index d1f72a5f..b01a779f 100644
--- a/templates/interfaces/bridge/node.tag/ip/rip/node.def
+++ b/templates/interfaces/bridge/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/node.def
index d1f72a5f..b01a779f 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def
index 793075b4..fd6064d5 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Inforamtion Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/node.def b/templates/interfaces/loopback/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/multilink/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/multilink/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/multilink/node.tag/ip/rip/node.def b/templates/interfaces/multilink/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/multilink/node.tag/ip/rip/node.def
+++ b/templates/interfaces/multilink/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/node.def
index 3ec8041e..16241372 100644
--- a/templates/interfaces/tunnel/node.tag/ip/rip/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/wirelessmodem/node.tag/ip/ospf/node.def b/templates/interfaces/wirelessmodem/node.tag/ip/ospf/node.def
index 1702547a..31980774 100644
--- a/templates/interfaces/wirelessmodem/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/wirelessmodem/node.tag/ip/ospf/node.def
@@ -1 +1,2 @@
 help: Set Open Shortest Path First (OSPF) parameters for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/wirelessmodem/node.tag/ip/rip/node.def b/templates/interfaces/wirelessmodem/node.tag/ip/rip/node.def
index d1f72a5f..b01a779f 100644
--- a/templates/interfaces/wirelessmodem/node.tag/ip/rip/node.def
+++ b/templates/interfaces/wirelessmodem/node.tag/ip/rip/node.def
@@ -1 +1,2 @@
 help: Set Routing Information Protocol (RIP) for specified interface
+create: sudo /opt/vyatta/sbin/quagga-manager check ripd