From fa02db87d16cb73c385c73e6c791856ba6982463 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Tue, 26 May 2009 10:28:27 -0700
Subject: Don't use --name option

I added --name option, but doesn't do what I expected.
---
 scripts/quagga-manager | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/quagga-manager b/scripts/quagga-manager
index 85bfec98..ff0c7f88 100755
--- a/scripts/quagga-manager
+++ b/scripts/quagga-manager
@@ -47,7 +47,7 @@ start() {
 	args+=( -l -S -s 1048576 )
     fi
 
-    exec start-stop-daemon --start --oknodo --quiet --name $daemon  \
+    exec start-stop-daemon --start --oknodo --quiet \
 		--chdir $log_dir --exec $binpath --pidfile $pidfile \
 		-- ${args[@]}
 }
@@ -58,7 +58,7 @@ stop() {
     local binpath=/usr/sbin/vyatta-$daemon
 
     start-stop-daemon --stop --quiet --oknodo --retry 5 \
-	--name $daemon --exec $binpath --pidfile=$pidfile
+	--exec $binpath --pidfile=$pidfile
     rm -f $pidfile
 }
 
-- 
cgit v1.2.3


From 54d34f54a3c3ca23b325a71bc9377b8c14493084 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Tue, 26 May 2009 10:28:59 -0700
Subject: Start BGP at start of policy transaction

Related to bug 4345
---
 templates/policy/node.def | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/policy/node.def b/templates/policy/node.def
index 40492e8b..2ab5d952 100644
--- a/templates/policy/node.def
+++ b/templates/policy/node.def
@@ -1,2 +1,2 @@
 help: Configure routing policy
-create: sudo /opt/vyatta/sbin/quagga-manager start bgpd
+begin: sudo /opt/vyatta/sbin/quagga-manager start bgpd
-- 
cgit v1.2.3