summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-05-26 10:30:06 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-05-26 10:30:06 -0700
commit2059e6e59d555637853aeed0d39e6be068b3ab92 (patch)
treeb41126819586d21809915c0f3575450a9e112a06
parent3cb08c341ed89b383cbc6b17c7571051329adefc (diff)
parent54d34f54a3c3ca23b325a71bc9377b8c14493084 (diff)
downloadvyatta-cfg-quagga-2059e6e59d555637853aeed0d39e6be068b3ab92.tar.gz
vyatta-cfg-quagga-2059e6e59d555637853aeed0d39e6be068b3ab92.zip
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg-quagga into jenner
-rwxr-xr-xscripts/quagga-manager4
-rw-r--r--templates/policy/node.def2
2 files changed, 3 insertions, 3 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
}
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