4 files changed, 3 insertions, 15 deletions
diff --git a/templates/protocols/bgp/disable/node.def b/templates/protocols/bgp/disable/node.def
deleted file mode 100644
index 2795453f..00000000
--- a/templates/protocols/bgp/disable/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-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 803362db..91d7261b 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -4,7 +4,7 @@ help: Configure Border Gateway Protocol (BGP) parameters
 comp_help: \1  <1-4294967294>\tAS number
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \
 		   "AS number must be between 1 and 4294967294"
-begin: sudo /opt/vyatta/sbin/quagga-manager start bgpd
+create: sudo /opt/vyatta/sbin/quagga-manager start bgpd
 update: 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
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index 731d39f1..1fd39bfe 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
-begin:  sudo /opt/vyatta/sbin/quagga-manager start ospfd
+create:  sudo /opt/vyatta/sbin/quagga-manager start ospfd
 create: 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/rip/node.def b/templates/protocols/rip/node.def
index b7f085a5..648ecf49 100644
--- a/templates/protocols/rip/node.def
+++ b/templates/protocols/rip/node.def
@@ -1,5 +1,5 @@
 help: Configure Routing Information Protocol (RIP) parameters
-begin: sudo /opt/vyatta/sbin/quagga-manager start ripd
+create: sudo /opt/vyatta/sbin/quagga-manager start ripd
 create: 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