d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If amd_flags is empty, don't add -p as it makes amd abend.

Browse Source
This commit is contained in:
brian 1999-06-08 13:00:30 +00:00
parent a14b1bb88a
commit f30751c163
7 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/network.subr
View File

@ -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

9
etc/rc.d/netoptions
View File

@ -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

9
etc/rc.d/network1
View File

@ -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

9
etc/rc.d/network2
View File

@ -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

9
etc/rc.d/network3
View File

@ -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

9
etc/rc.d/routing
View File

@ -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

9
etc/rc.network
View File

@ -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