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

* Add an eval so that ipnat_flags=">/dev/null" works, per the PR

Browse Source 
* 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>
This commit is contained in:
dougb 2000-12-17 22:14:49 +00:00
parent 123cf0fb40
commit ccc9a8e876
7 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/network.subr
View File

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

8
etc/rc.d/netoptions
View File

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

8
etc/rc.d/network1
View File

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

8
etc/rc.d/network2
View File

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

8
etc/rc.d/network3
View File

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

8
etc/rc.d/routing
View File

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

8
etc/rc.network
View File

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