From 5205f4cd0d68a78c86fce6588f9c276861bb9cdd Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 16 Feb 2009 15:25:14 -0800 Subject: Move daemon start to the disable node Need way to get daemons started before top level node. Really a hack because of the way priorities are managed on node hieararchy --- templates/protocols/bgp/disable/node.def | 12 ++++++++++++ templates/protocols/bgp/node.def | 8 -------- templates/protocols/bgp/node.tag/node.def | 0 templates/protocols/ospf/disable/node.def | 12 ++++++++++++ templates/protocols/ospf/node.def | 4 +--- templates/protocols/rip/disable/node.def | 12 ++++++++++++ templates/protocols/rip/node.def | 6 +----- templates/protocols/ripng/disable/node.def | 12 ++++++++++++ templates/protocols/ripng/node.def | 4 +--- 9 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 templates/protocols/bgp/disable/node.def create mode 100644 templates/protocols/bgp/node.tag/node.def create mode 100644 templates/protocols/ospf/disable/node.def create mode 100644 templates/protocols/rip/disable/node.def create mode 100644 templates/protocols/ripng/disable/node.def diff --git a/templates/protocols/bgp/disable/node.def b/templates/protocols/bgp/disable/node.def new file mode 100644 index 00000000..2795453f --- /dev/null +++ b/templates/protocols/bgp/disable/node.def @@ -0,0 +1,12 @@ +type: bool +help: Disable BGP daemon +default: false +update: if [ $VAR(@) == "true" ]; + then sudo ${vyatta_sbindir}/vyatta-protocol stop bgpd + else sudo ${vyatta_sbindir}/vyatta-protocol start bgpd + fi +possible completions: + true Stop BGP daemon + false Start BGP daemon + +allowed: echo "true false" diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index ea3a9c4c..520da78f 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -5,15 +5,7 @@ comp_help: \1 <1-4294967294>\tAS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \ "AS number must be between 1 and 4294967294" -create: if [ $(pgrep -c -x vyatta-bgpd) -eq 0 ] - then sudo ${vyatta_sbindir}/vyatta-protocol start bgpd - fi - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" \ -c "bgp network import-check" -delete: vyatta-vtysh -c "configure terminal" -c "no router bgp $VAR(@)" - if ! ${vyatta_sbindir}/vyatta-check-typeless-node.pl "protocols bgp" - then sudo ${vyatta_sbindir}/vyatta-protocol stop bgpd - fi diff --git a/templates/protocols/bgp/node.tag/node.def b/templates/protocols/bgp/node.tag/node.def new file mode 100644 index 00000000..e69de29b diff --git a/templates/protocols/ospf/disable/node.def b/templates/protocols/ospf/disable/node.def new file mode 100644 index 00000000..eeccb9a1 --- /dev/null +++ b/templates/protocols/ospf/disable/node.def @@ -0,0 +1,12 @@ +type: bool +help: Disable OSPF daemon +default: false +update: if [ $VAR(@) == "true" ]; + then sudo ${vyatta_sbindir}/vyatta-protocol stop ospfd + else sudo ${vyatta_sbindir}/vyatta-protocol start ospfd + fi +possible completions: + true Stop OSPF daemon + false Start OSPF daemon + +allowed: echo "true false" diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def index f14b1fb8..b28f5553 100644 --- a/templates/protocols/ospf/node.def +++ b/templates/protocols/ospf/node.def @@ -1,5 +1,3 @@ help: Configure Open Shortest Path First protocol (OSPF) parameters -create: sudo ${vyatta_sbindir}/vyatta-protocol start ospfd - vyatta-vtysh -c "configure terminal" -c "router ospf" +create: vyatta-vtysh -c "configure terminal" -c "router ospf" delete: vyatta-vtysh -c "configure terminal" -c "no router ospf" - sudo ${vyatta_sbindir}/vyatta-protocol stop ospfd diff --git a/templates/protocols/rip/disable/node.def b/templates/protocols/rip/disable/node.def new file mode 100644 index 00000000..4cd56588 --- /dev/null +++ b/templates/protocols/rip/disable/node.def @@ -0,0 +1,12 @@ +type: bool +help: Disable RIP daemon +default: false +update: if [ $VAR(@) == "true" ]; + then sudo ${vyatta_sbindir}/vyatta-protocol stop ripd + else sudo ${vyatta_sbindir}/vyatta-protocol start ripd + fi +possible completions: + true Stop RIP daemon + false Start RIP daemon + +allowed: echo "true false" diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def index 20cb58ad..541baa8d 100644 --- a/templates/protocols/rip/node.def +++ b/templates/protocols/rip/node.def @@ -1,7 +1,3 @@ help: Configure Routing Information Protocol (RIP) parameters -create: sudo ${vyatta_sbindir}/vyatta-protocol start ripd - vyatta-vtysh -c "configure terminal" -c "router rip" +create: vyatta-vtysh -c "configure terminal" -c "router rip" delete: vyatta-vtysh -c "configure terminal" -c "no router rip" - sudo ${vyatta_sbindir}/vyatta-protocol stop ripd - - diff --git a/templates/protocols/ripng/disable/node.def b/templates/protocols/ripng/disable/node.def new file mode 100644 index 00000000..d23c9c5f --- /dev/null +++ b/templates/protocols/ripng/disable/node.def @@ -0,0 +1,12 @@ +type: bool +help: Disable RIPng daemon +default: false +update: if [ $VAR(@) == "true" ]; + then sudo ${vyatta_sbindir}/vyatta-protocol stop ripngd + else sudo ${vyatta_sbindir}/vyatta-protocol start ripngd + fi +possible completions: + true Stop RIPng daemon + false Start RIPng daemon + +allowed: echo "true false" diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def index 73f86c92..61c30b01 100644 --- a/templates/protocols/ripng/node.def +++ b/templates/protocols/ripng/node.def @@ -1,5 +1,3 @@ help: Configure Routing Information Protocol (RIPng) parameters -create: sudo ${vyatta_sbindir}/vyatta-protocol start ripngd - vyatta-vtysh -c "configure terminal" -c "router ripng" +create: vyatta-vtysh -c "configure terminal" -c "router ripng" delete: vyatta-vtysh -c "configure terminal" -c "no router ripng" - sudo ${vyatta_sbindir}/vyatta-protocol stop ripngd -- cgit v1.2.3