diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/etc/frr/daemons.conf | 3 | ||||
| -rwxr-xr-x | tools/frr.in | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/tools/etc/frr/daemons.conf b/tools/etc/frr/daemons.conf index bd0e370d1e..94221301eb 100644 --- a/tools/etc/frr/daemons.conf +++ b/tools/etc/frr/daemons.conf @@ -24,7 +24,8 @@ fabricd_options=" --daemon -A 127.0.0.1" # The list of daemons to watch is automatically generated by the init script. watchfrr_enable=yes -watchfrr_options=(-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB) + +watchfrr_options=(-d -r /usr/lib/frr/frrbBrestartbB%s -s /usr/lib/frr/frrbBstartbB%s -k /usr/lib/frr/frrbBstopbB%s -b bB) # If valgrind_enable is 'yes' the frr daemons will be started via valgrind. # The use case for doing so is tracking down memory leaks, etc in frr. diff --git a/tools/frr.in b/tools/frr.in index ee8dc883dc..ec383bc5a0 100755 --- a/tools/frr.in +++ b/tools/frr.in @@ -127,6 +127,7 @@ start() echo -n " $1" fi + ${SSD} \ --start \ --pidfile=`pidfile $1` \ @@ -148,7 +149,6 @@ start() -- \ `eval echo "$""$1""_options"` -n "$2" else - echo -n " $1" if ! check_daemon $1; then echo -n " (binary does not exist)" return; @@ -210,7 +210,6 @@ stop() # Now we have to wait until $DAEMON has _really_ stopped. # if test -n "$PID" && kill -0 $PID 2>/dev/null; then - echo -n " (waiting) ." cnt=0 while kill -0 $PID 2>/dev/null; do cnt=`expr $cnt + 1` @@ -220,10 +219,8 @@ stop() break fi sleep 2 - echo -n "." done fi - echo -n " $inst" rm -f `pidfile $inst` rm -f `vtyfile $inst` @@ -305,7 +302,6 @@ start_watchfrr() # Start if at least one daemon is activated. if [ $found_one -eq 1 ]; then - echo -n "Starting Frr monitor daemon:" start watchfrr echo "." fi @@ -408,8 +404,6 @@ start_prio() wanted_prio=$1 daemon_list=${daemon:-$DAEMONS} - echo -n "Starting Frr daemons (prio:$wanted_prio):" - for prio_i in `seq 1 $wanted_prio`; do for daemon_name in $daemon_list; do eval daemon_prio=\$${daemon_name} @@ -447,7 +441,6 @@ start_prio() eval "file_list_suffix="$V_PATH"/"$daemon_name-*"" for pidfile in $file_list_suffix.pid; do ${SSD} --stop --quiet --oknodo --pidfile "$pidfile" - echo -n "." rm -rf "$pidfile" done for vtyfile in $file_list_suffix.vty; do @@ -459,7 +452,6 @@ start_prio() fi done done - echo "." } check_status() |