diff options
| author | brian <brian@FreeBSD.org> | 1999-06-08 13:00:30 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 1999-06-08 13:00:30 +0000 |
| commit | f30751c163814b434778611b74a47da97079dd02 (patch) | |
| tree | 717c5062055f418368a36246f9ef7f3b39602d2b /etc | |
| parent | a14b1bb88a8829d26a846e2479812aa1ed5685ab (diff) | |
| download | FreeBSD-src-f30751c163814b434778611b74a47da97079dd02.zip FreeBSD-src-f30751c163814b434778611b74a47da97079dd02.tar.gz | |
If amd_flags is empty, don't add -p as it makes amd abend.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/network.subr | 9 | ||||
| -rw-r--r-- | etc/rc.d/netoptions | 9 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 9 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 9 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 9 | ||||
| -rw-r--r-- | etc/rc.d/routing | 9 | ||||
| -rw-r--r-- | etc/rc.network | 9 |
7 files changed, 49 insertions, 14 deletions
diff --git a/etc/network.subr b/etc/network.subr index 58cbc78..0a40acc 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $ +# $Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -315,7 +315,12 @@ network_pass3() { if [ "X${amd_map_program}" != X"NO" ]; then amd_flags="${amd_flags} `eval ${amd_map_program}`" fi - amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + if [ -n "$amd_flags" ] + then + amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + else + amd 2> /dev/null + fi fi if [ "X${rwhod_enable}" = X"YES" ]; then diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 58cbc78..0a40acc 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $ +# $Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -315,7 +315,12 @@ network_pass3() { if [ "X${amd_map_program}" != X"NO" ]; then amd_flags="${amd_flags} `eval ${amd_map_program}`" fi - amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + if [ -n "$amd_flags" ] + then + amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + else + amd 2> /dev/null + fi fi if [ "X${rwhod_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 58cbc78..0a40acc 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $ +# $Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -315,7 +315,12 @@ network_pass3() { if [ "X${amd_map_program}" != X"NO" ]; then amd_flags="${amd_flags} `eval ${amd_map_program}`" fi - amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + if [ -n "$amd_flags" ] + then + amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + else + amd 2> /dev/null + fi fi if [ "X${rwhod_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 58cbc78..0a40acc 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $ +# $Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -315,7 +315,12 @@ network_pass3() { if [ "X${amd_map_program}" != X"NO" ]; then amd_flags="${amd_flags} `eval ${amd_map_program}`" fi - amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + if [ -n "$amd_flags" ] + then + amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + else + amd 2> /dev/null + fi fi if [ "X${rwhod_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 58cbc78..0a40acc 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $ +# $Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -315,7 +315,12 @@ network_pass3() { if [ "X${amd_map_program}" != X"NO" ]; then amd_flags="${amd_flags} `eval ${amd_map_program}`" fi - amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + if [ -n "$amd_flags" ] + then + amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + else + amd 2> /dev/null + fi fi if [ "X${rwhod_enable}" = X"YES" ]; then diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 58cbc78..0a40acc 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $ +# $Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -315,7 +315,12 @@ network_pass3() { if [ "X${amd_map_program}" != X"NO" ]; then amd_flags="${amd_flags} `eval ${amd_map_program}`" fi - amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + if [ -n "$amd_flags" ] + then + amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + else + amd 2> /dev/null + fi fi if [ "X${rwhod_enable}" = X"YES" ]; then diff --git a/etc/rc.network b/etc/rc.network index 58cbc78..0a40acc 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $ +# $Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -315,7 +315,12 @@ network_pass3() { if [ "X${amd_map_program}" != X"NO" ]; then amd_flags="${amd_flags} `eval ${amd_map_program}`" fi - amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + if [ -n "$amd_flags" ] + then + amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null + else + amd 2> /dev/null + fi fi if [ "X${rwhod_enable}" = X"YES" ]; then |
