diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-05 10:57:19 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-05 10:57:19 -0800 |
| commit | 6c40b894293c3472d5c428287465bfe363ae0255 (patch) | |
| tree | df04fec03b3740a2261f04f0da1a9ed3780d3e7b | |
| parent | 72d0fdc08c52574ad3a94ea5d94c4466ddf51063 (diff) | |
| parent | 7047feb74cec411ce51d00a87005ee284cb51fe8 (diff) | |
| download | vyatta-cfg-quagga-6c40b894293c3472d5c428287465bfe363ae0255.tar.gz vyatta-cfg-quagga-6c40b894293c3472d5c428287465bfe363ae0255.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg-quagga into jenner
| -rwxr-xr-x | scripts/vyatta-protocol | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/vyatta-protocol b/scripts/vyatta-protocol index 2d4ba430..e8fff484 100755 --- a/scripts/vyatta-protocol +++ b/scripts/vyatta-protocol @@ -27,7 +27,6 @@ fi case "$1" in start) - echo -n "Starting $protocol..." sudo start-stop-daemon --start --quiet \ --chdir $log_dir \ --exec $exe_file \ @@ -37,20 +36,18 @@ case "$1" in --pidfile $pid_dir/watch-${daemon}.pid \ --exec /usr/sbin/vyatta-watchquagga \ -- -dz -R "/opt/vyatta/sbin/vyatta-quagga reload $protocol" $daemon - echo "done." ;; stop) - echo -n "Stopping $protocol..." sudo start-stop-daemon --stop --quiet --oknodo --retry 2 \ --pidfile $pid_dir/watch-${daemon}.pid + sudo rm -f $pid_dir/watch-${daemon}.pid sudo start-stop-daemon --stop --quiet --oknodo --retry 2 \ --exec $exe_file - echo "done." + sudo rm -f $pid_dir/${daemon}.pid ;; reload) - echo -n "Reloading $1..." # Start new transaction /opt/vyatta/sbin/vyatta-cfg-cmd-wrapper begin @@ -66,7 +63,6 @@ case "$1" in # Reload causing configuration to activate - implies commit /opt/vyatta/sbin/vyatta-load-config.pl $TMP - echo "done." ;; *) usage;; |