diff options
| author | John Southworth <john.southworth@vyatta.com> | 2013-04-17 17:01:48 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2013-04-17 17:01:48 -0700 |
| commit | 2c91255a39f54d923db72e90fafba4b2928aa5d2 (patch) | |
| tree | c53f12f984a5a6e7dc9bb93218f55a965f1c9301 | |
| parent | 3351b6a2724ab48e873d62b019be323e195aae36 (diff) | |
| download | vyatta-cfg-system-2c91255a39f54d923db72e90fafba4b2928aa5d2.tar.gz vyatta-cfg-system-2c91255a39f54d923db72e90fafba4b2928aa5d2.zip | |
Cleanup fix for 8711
Fix pgrep logic and formatting.
| -rw-r--r-- | templates/system/ipv6/disable-forwarding/node.def | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/templates/system/ipv6/disable-forwarding/node.def b/templates/system/ipv6/disable-forwarding/node.def index eefb8328..b930e3d2 100644 --- a/templates/system/ipv6/disable-forwarding/node.def +++ b/templates/system/ipv6/disable-forwarding/node.def @@ -23,24 +23,23 @@ delete: sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding" cd /proc/sys/net/ipv6/conf for i in * ; do - if [[ "$i" == "default" ]] || - [[ "$i" == "all" ]] || - [[ ! -d "$i" ]; then - continue - fi - if [[ -e /var/run/vyatta/ipv6_no_fwd.$i ]]; then - sudo sh -c "echo 0 > $i/forwarding" - fi + if [[ "$i" == "default" ]] || + [[ "$i" == "all" ]] || + [[ ! -d "$i" ]]; then + continue + fi + if [[ -e /var/run/vyatta/ipv6_no_fwd.$i ]]; then + sudo sh -c "echo 0 > $i/forwarding" + fi done sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/default/forwarding" # # If router advertisements were configured while global IPv6 # forwarding was disabled, we will need to start the radvd daemon # now. - running=$(pgrep -n radvd) - if [[ $running -eq 0 ]] && - [[ -e /etc/radvd.conf ]] && - [[ -x /etc/init.d/radvd ]; then - /etc/init.d/radvd start + if [[ -e /etc/radvd.conf ]]; then + if [[ -z "$(pgrep -u radvd radvd)" ]]; then + /etc/init.d/radvd start + fi fi |