diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2000-12-17 22:14:49 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2000-12-17 22:14:49 +0000 |
| commit | 8f38f3b2e60e7217901da5e879bbfc01a3eaeace (patch) | |
| tree | ce1e61c4b07f93a45df2bdbe5a32a33c3e265ed2 /etc/rc.d | |
| parent | b048419e0d44ff30dfac3f443a8b632d06292853 (diff) | |
| download | src-8f38f3b2e60e7217901da5e879bbfc01a3eaeace.tar.gz src-8f38f3b2e60e7217901da5e879bbfc01a3eaeace.zip | |
* Add an eval so that ipnat_flags=">/dev/null" works, per the PR
* Do some line length and specify full path cleanups while I'm here
PR: conf/22937
Submitted by: Andre Albsmeier <andre.albsmeier@mchp.siemens.de>
Notes
Notes:
svn path=/head/; revision=70129
Diffstat (limited to 'etc/rc.d')
| -rw-r--r-- | etc/rc.d/netoptions | 8 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 8 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 8 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 8 | ||||
| -rw-r--r-- | etc/rc.d/routing | 8 |
5 files changed, 25 insertions, 15 deletions
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 1e67911c26ef..ef6c6038b029 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 1e67911c26ef..ef6c6038b029 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 1e67911c26ef..ef6c6038b029 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 1e67911c26ef..ef6c6038b029 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 1e67911c26ef..ef6c6038b029 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi |