diff options
| author | Hiroyuki Sato <hiroysato@gmail.com> | 2015-01-26 13:31:12 +0900 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-02-27 20:17:27 +0100 |
| commit | f4283e577555f6833aceea88f5226e271210c9d0 (patch) | |
| tree | a7380cd7bf3811f046ffa84eca92955396f7d210 | |
| parent | 16ea863db6c453d6fea3bc0aa701c50202a6b697 (diff) | |
| download | vyatta-cfg-system-f4283e577555f6833aceea88f5226e271210c9d0.tar.gz vyatta-cfg-system-f4283e577555f6833aceea88f5226e271210c9d0.zip | |
Fix Bug#382. (Another fix).
If radvd is not running, the pgrep command returns an empty string, not zero.
Reported-by Carl Byington <vyos-bug@five-ten-sg.com>
| -rw-r--r-- | templates/system/ipv6/disable-forwarding/node.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/system/ipv6/disable-forwarding/node.def b/templates/system/ipv6/disable-forwarding/node.def index 5e689c5b..323b99d6 100644 --- a/templates/system/ipv6/disable-forwarding/node.def +++ b/templates/system/ipv6/disable-forwarding/node.def @@ -38,7 +38,7 @@ delete: # forwarding was disabled, we will need to start the radvd daemon # now. running=$(pgrep -n radvd) - if [[ $running -eq 0 ]] && + if [[ -z "$running" ]] && [[ -e /etc/radvd.conf ]] && [[ -x /etc/init.d/radvd ]]; then /etc/init.d/radvd start |