diff options
author | jkh <jkh@FreeBSD.org> | 1998-05-19 04:36:31 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1998-05-19 04:36:31 +0000 |
commit | f99594a8c36b12b241571f8dd7d629c33e5527d3 (patch) | |
tree | 16990967a59ab6037cf89c012d6ecf4b086c8b98 /etc | |
parent | 5a379d943a503c606a38d0fcc9cdd0de3f83961f (diff) | |
download | FreeBSD-src-f99594a8c36b12b241571f8dd7d629c33e5527d3.zip FreeBSD-src-f99594a8c36b12b241571f8dd7d629c33e5527d3.tar.gz |
cosmetic: clean up startup messages and rearrange some options
to go in a more proper order.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/network.subr | 35 | ||||
-rw-r--r-- | etc/rc.d/netoptions | 35 | ||||
-rw-r--r-- | etc/rc.d/network1 | 35 | ||||
-rw-r--r-- | etc/rc.d/network2 | 35 | ||||
-rw-r--r-- | etc/rc.d/network3 | 35 | ||||
-rw-r--r-- | etc/rc.d/routing | 35 | ||||
-rw-r--r-- | etc/rc.network | 35 |
7 files changed, 119 insertions, 126 deletions
diff --git a/etc/network.subr b/etc/network.subr index 4f22a9a..6490c48 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas Exp $ +# $Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -65,8 +65,7 @@ network_pass1() { fi if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then - modload /lkm/ipfw_mod.o - if [ $? = 0 ]; then + if modload /lkm/ipfw_mod.o; then firewall_in_kernel=1 # module loaded successfully echo "Kernel firewall module loaded." else @@ -127,28 +126,34 @@ network_pass1() { sysctl -w net.inet.ip.accept_sourceroute=1 >/dev/null 2>&1 fi - if [ "X$router_enable" = X"YES" ]; then - echo -n " ${router}"; ${router} ${router_flags} - fi - if [ "X$ipxgateway_enable" = X"YES" ]; then echo -n ' IPX gateway=YES' sysctl -w net.ipx.ipx.ipxforwarding=1 >/dev/null 2>&1 fi + if [ "X$arpproxy_all" = X"YES" ]; then + echo -n ' enabling ARP_PROXY_ALL: ' + sysctl -w net.link.ether.inet.proxyall=1 2>&1 + fi + echo '.' + + echo -n 'routing daemons:' + if [ "X$router_enable" = X"YES" ]; then + echo -n " ${router}"; ${router} ${router_flags} + fi + if [ "X$ipxrouted_enable" = X"YES" ]; then - echo -n ' IPXrouted: ' + echo -n ' IPXrouted' IPXrouted ${ipxrouted_flags} > /dev/null 2>&1 fi - if [ "X$arpproxy_all" = X"YES" ]; then - echo -n ' enabling ARP_PROXY_ALL: ' - sysctl -w net.link.ether.inet.proxyall=1 2>&1 + if [ "X${mrouted_enable}" = X"YES" ]; then + echo -n ' mrouted'; mrouted ${mrouted_flags} fi + if [ "X$rarpd_enable" = X"YES" ]; then echo -n ' rarpd'; rarpd ${rarpd_flags} fi - echo '.' network_pass1_done=YES # Let future generations know we made it. } @@ -220,7 +225,6 @@ network_pass3() { fi mountd ${mountd_flags} if [ "X${nfs_reserved_port_only}" = X"YES" ]; then - echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi echo -n ' nfsd'; nfsd ${nfs_server_flags} @@ -264,11 +268,6 @@ network_pass3() { unset stash_flag fi - # IP multicast routing daemon - if [ "X${mrouted_enable}" = X"YES" ]; then - echo -n ' mrouted'; mrouted ${mrouted_flags} - fi - # Network Address Translation daemon if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then if [ -a "X${firewall_enable}" = X"YES" ]; then diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 4f22a9a..6490c48 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas Exp $ +# $Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -65,8 +65,7 @@ network_pass1() { fi if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then - modload /lkm/ipfw_mod.o - if [ $? = 0 ]; then + if modload /lkm/ipfw_mod.o; then firewall_in_kernel=1 # module loaded successfully echo "Kernel firewall module loaded." else @@ -127,28 +126,34 @@ network_pass1() { sysctl -w net.inet.ip.accept_sourceroute=1 >/dev/null 2>&1 fi - if [ "X$router_enable" = X"YES" ]; then - echo -n " ${router}"; ${router} ${router_flags} - fi - if [ "X$ipxgateway_enable" = X"YES" ]; then echo -n ' IPX gateway=YES' sysctl -w net.ipx.ipx.ipxforwarding=1 >/dev/null 2>&1 fi + if [ "X$arpproxy_all" = X"YES" ]; then + echo -n ' enabling ARP_PROXY_ALL: ' + sysctl -w net.link.ether.inet.proxyall=1 2>&1 + fi + echo '.' + + echo -n 'routing daemons:' + if [ "X$router_enable" = X"YES" ]; then + echo -n " ${router}"; ${router} ${router_flags} + fi + if [ "X$ipxrouted_enable" = X"YES" ]; then - echo -n ' IPXrouted: ' + echo -n ' IPXrouted' IPXrouted ${ipxrouted_flags} > /dev/null 2>&1 fi - if [ "X$arpproxy_all" = X"YES" ]; then - echo -n ' enabling ARP_PROXY_ALL: ' - sysctl -w net.link.ether.inet.proxyall=1 2>&1 + if [ "X${mrouted_enable}" = X"YES" ]; then + echo -n ' mrouted'; mrouted ${mrouted_flags} fi + if [ "X$rarpd_enable" = X"YES" ]; then echo -n ' rarpd'; rarpd ${rarpd_flags} fi - echo '.' network_pass1_done=YES # Let future generations know we made it. } @@ -220,7 +225,6 @@ network_pass3() { fi mountd ${mountd_flags} if [ "X${nfs_reserved_port_only}" = X"YES" ]; then - echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi echo -n ' nfsd'; nfsd ${nfs_server_flags} @@ -264,11 +268,6 @@ network_pass3() { unset stash_flag fi - # IP multicast routing daemon - if [ "X${mrouted_enable}" = X"YES" ]; then - echo -n ' mrouted'; mrouted ${mrouted_flags} - fi - # Network Address Translation daemon if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then if [ -a "X${firewall_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 4f22a9a..6490c48 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas Exp $ +# $Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -65,8 +65,7 @@ network_pass1() { fi if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then - modload /lkm/ipfw_mod.o - if [ $? = 0 ]; then + if modload /lkm/ipfw_mod.o; then firewall_in_kernel=1 # module loaded successfully echo "Kernel firewall module loaded." else @@ -127,28 +126,34 @@ network_pass1() { sysctl -w net.inet.ip.accept_sourceroute=1 >/dev/null 2>&1 fi - if [ "X$router_enable" = X"YES" ]; then - echo -n " ${router}"; ${router} ${router_flags} - fi - if [ "X$ipxgateway_enable" = X"YES" ]; then echo -n ' IPX gateway=YES' sysctl -w net.ipx.ipx.ipxforwarding=1 >/dev/null 2>&1 fi + if [ "X$arpproxy_all" = X"YES" ]; then + echo -n ' enabling ARP_PROXY_ALL: ' + sysctl -w net.link.ether.inet.proxyall=1 2>&1 + fi + echo '.' + + echo -n 'routing daemons:' + if [ "X$router_enable" = X"YES" ]; then + echo -n " ${router}"; ${router} ${router_flags} + fi + if [ "X$ipxrouted_enable" = X"YES" ]; then - echo -n ' IPXrouted: ' + echo -n ' IPXrouted' IPXrouted ${ipxrouted_flags} > /dev/null 2>&1 fi - if [ "X$arpproxy_all" = X"YES" ]; then - echo -n ' enabling ARP_PROXY_ALL: ' - sysctl -w net.link.ether.inet.proxyall=1 2>&1 + if [ "X${mrouted_enable}" = X"YES" ]; then + echo -n ' mrouted'; mrouted ${mrouted_flags} fi + if [ "X$rarpd_enable" = X"YES" ]; then echo -n ' rarpd'; rarpd ${rarpd_flags} fi - echo '.' network_pass1_done=YES # Let future generations know we made it. } @@ -220,7 +225,6 @@ network_pass3() { fi mountd ${mountd_flags} if [ "X${nfs_reserved_port_only}" = X"YES" ]; then - echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi echo -n ' nfsd'; nfsd ${nfs_server_flags} @@ -264,11 +268,6 @@ network_pass3() { unset stash_flag fi - # IP multicast routing daemon - if [ "X${mrouted_enable}" = X"YES" ]; then - echo -n ' mrouted'; mrouted ${mrouted_flags} - fi - # Network Address Translation daemon if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then if [ -a "X${firewall_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 4f22a9a..6490c48 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas Exp $ +# $Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -65,8 +65,7 @@ network_pass1() { fi if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then - modload /lkm/ipfw_mod.o - if [ $? = 0 ]; then + if modload /lkm/ipfw_mod.o; then firewall_in_kernel=1 # module loaded successfully echo "Kernel firewall module loaded." else @@ -127,28 +126,34 @@ network_pass1() { sysctl -w net.inet.ip.accept_sourceroute=1 >/dev/null 2>&1 fi - if [ "X$router_enable" = X"YES" ]; then - echo -n " ${router}"; ${router} ${router_flags} - fi - if [ "X$ipxgateway_enable" = X"YES" ]; then echo -n ' IPX gateway=YES' sysctl -w net.ipx.ipx.ipxforwarding=1 >/dev/null 2>&1 fi + if [ "X$arpproxy_all" = X"YES" ]; then + echo -n ' enabling ARP_PROXY_ALL: ' + sysctl -w net.link.ether.inet.proxyall=1 2>&1 + fi + echo '.' + + echo -n 'routing daemons:' + if [ "X$router_enable" = X"YES" ]; then + echo -n " ${router}"; ${router} ${router_flags} + fi + if [ "X$ipxrouted_enable" = X"YES" ]; then - echo -n ' IPXrouted: ' + echo -n ' IPXrouted' IPXrouted ${ipxrouted_flags} > /dev/null 2>&1 fi - if [ "X$arpproxy_all" = X"YES" ]; then - echo -n ' enabling ARP_PROXY_ALL: ' - sysctl -w net.link.ether.inet.proxyall=1 2>&1 + if [ "X${mrouted_enable}" = X"YES" ]; then + echo -n ' mrouted'; mrouted ${mrouted_flags} fi + if [ "X$rarpd_enable" = X"YES" ]; then echo -n ' rarpd'; rarpd ${rarpd_flags} fi - echo '.' network_pass1_done=YES # Let future generations know we made it. } @@ -220,7 +225,6 @@ network_pass3() { fi mountd ${mountd_flags} if [ "X${nfs_reserved_port_only}" = X"YES" ]; then - echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi echo -n ' nfsd'; nfsd ${nfs_server_flags} @@ -264,11 +268,6 @@ network_pass3() { unset stash_flag fi - # IP multicast routing daemon - if [ "X${mrouted_enable}" = X"YES" ]; then - echo -n ' mrouted'; mrouted ${mrouted_flags} - fi - # Network Address Translation daemon if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then if [ -a "X${firewall_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 4f22a9a..6490c48 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas Exp $ +# $Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -65,8 +65,7 @@ network_pass1() { fi if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then - modload /lkm/ipfw_mod.o - if [ $? = 0 ]; then + if modload /lkm/ipfw_mod.o; then firewall_in_kernel=1 # module loaded successfully echo "Kernel firewall module loaded." else @@ -127,28 +126,34 @@ network_pass1() { sysctl -w net.inet.ip.accept_sourceroute=1 >/dev/null 2>&1 fi - if [ "X$router_enable" = X"YES" ]; then - echo -n " ${router}"; ${router} ${router_flags} - fi - if [ "X$ipxgateway_enable" = X"YES" ]; then echo -n ' IPX gateway=YES' sysctl -w net.ipx.ipx.ipxforwarding=1 >/dev/null 2>&1 fi + if [ "X$arpproxy_all" = X"YES" ]; then + echo -n ' enabling ARP_PROXY_ALL: ' + sysctl -w net.link.ether.inet.proxyall=1 2>&1 + fi + echo '.' + + echo -n 'routing daemons:' + if [ "X$router_enable" = X"YES" ]; then + echo -n " ${router}"; ${router} ${router_flags} + fi + if [ "X$ipxrouted_enable" = X"YES" ]; then - echo -n ' IPXrouted: ' + echo -n ' IPXrouted' IPXrouted ${ipxrouted_flags} > /dev/null 2>&1 fi - if [ "X$arpproxy_all" = X"YES" ]; then - echo -n ' enabling ARP_PROXY_ALL: ' - sysctl -w net.link.ether.inet.proxyall=1 2>&1 + if [ "X${mrouted_enable}" = X"YES" ]; then + echo -n ' mrouted'; mrouted ${mrouted_flags} fi + if [ "X$rarpd_enable" = X"YES" ]; then echo -n ' rarpd'; rarpd ${rarpd_flags} fi - echo '.' network_pass1_done=YES # Let future generations know we made it. } @@ -220,7 +225,6 @@ network_pass3() { fi mountd ${mountd_flags} if [ "X${nfs_reserved_port_only}" = X"YES" ]; then - echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi echo -n ' nfsd'; nfsd ${nfs_server_flags} @@ -264,11 +268,6 @@ network_pass3() { unset stash_flag fi - # IP multicast routing daemon - if [ "X${mrouted_enable}" = X"YES" ]; then - echo -n ' mrouted'; mrouted ${mrouted_flags} - fi - # Network Address Translation daemon if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then if [ -a "X${firewall_enable}" = X"YES" ]; then diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 4f22a9a..6490c48 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas Exp $ +# $Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -65,8 +65,7 @@ network_pass1() { fi if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then - modload /lkm/ipfw_mod.o - if [ $? = 0 ]; then + if modload /lkm/ipfw_mod.o; then firewall_in_kernel=1 # module loaded successfully echo "Kernel firewall module loaded." else @@ -127,28 +126,34 @@ network_pass1() { sysctl -w net.inet.ip.accept_sourceroute=1 >/dev/null 2>&1 fi - if [ "X$router_enable" = X"YES" ]; then - echo -n " ${router}"; ${router} ${router_flags} - fi - if [ "X$ipxgateway_enable" = X"YES" ]; then echo -n ' IPX gateway=YES' sysctl -w net.ipx.ipx.ipxforwarding=1 >/dev/null 2>&1 fi + if [ "X$arpproxy_all" = X"YES" ]; then + echo -n ' enabling ARP_PROXY_ALL: ' + sysctl -w net.link.ether.inet.proxyall=1 2>&1 + fi + echo '.' + + echo -n 'routing daemons:' + if [ "X$router_enable" = X"YES" ]; then + echo -n " ${router}"; ${router} ${router_flags} + fi + if [ "X$ipxrouted_enable" = X"YES" ]; then - echo -n ' IPXrouted: ' + echo -n ' IPXrouted' IPXrouted ${ipxrouted_flags} > /dev/null 2>&1 fi - if [ "X$arpproxy_all" = X"YES" ]; then - echo -n ' enabling ARP_PROXY_ALL: ' - sysctl -w net.link.ether.inet.proxyall=1 2>&1 + if [ "X${mrouted_enable}" = X"YES" ]; then + echo -n ' mrouted'; mrouted ${mrouted_flags} fi + if [ "X$rarpd_enable" = X"YES" ]; then echo -n ' rarpd'; rarpd ${rarpd_flags} fi - echo '.' network_pass1_done=YES # Let future generations know we made it. } @@ -220,7 +225,6 @@ network_pass3() { fi mountd ${mountd_flags} if [ "X${nfs_reserved_port_only}" = X"YES" ]; then - echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi echo -n ' nfsd'; nfsd ${nfs_server_flags} @@ -264,11 +268,6 @@ network_pass3() { unset stash_flag fi - # IP multicast routing daemon - if [ "X${mrouted_enable}" = X"YES" ]; then - echo -n ' mrouted'; mrouted ${mrouted_flags} - fi - # Network Address Translation daemon if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then if [ -a "X${firewall_enable}" = X"YES" ]; then diff --git a/etc/rc.network b/etc/rc.network index 4f22a9a..6490c48 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas Exp $ +# $Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -65,8 +65,7 @@ network_pass1() { fi if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then - modload /lkm/ipfw_mod.o - if [ $? = 0 ]; then + if modload /lkm/ipfw_mod.o; then firewall_in_kernel=1 # module loaded successfully echo "Kernel firewall module loaded." else @@ -127,28 +126,34 @@ network_pass1() { sysctl -w net.inet.ip.accept_sourceroute=1 >/dev/null 2>&1 fi - if [ "X$router_enable" = X"YES" ]; then - echo -n " ${router}"; ${router} ${router_flags} - fi - if [ "X$ipxgateway_enable" = X"YES" ]; then echo -n ' IPX gateway=YES' sysctl -w net.ipx.ipx.ipxforwarding=1 >/dev/null 2>&1 fi + if [ "X$arpproxy_all" = X"YES" ]; then + echo -n ' enabling ARP_PROXY_ALL: ' + sysctl -w net.link.ether.inet.proxyall=1 2>&1 + fi + echo '.' + + echo -n 'routing daemons:' + if [ "X$router_enable" = X"YES" ]; then + echo -n " ${router}"; ${router} ${router_flags} + fi + if [ "X$ipxrouted_enable" = X"YES" ]; then - echo -n ' IPXrouted: ' + echo -n ' IPXrouted' IPXrouted ${ipxrouted_flags} > /dev/null 2>&1 fi - if [ "X$arpproxy_all" = X"YES" ]; then - echo -n ' enabling ARP_PROXY_ALL: ' - sysctl -w net.link.ether.inet.proxyall=1 2>&1 + if [ "X${mrouted_enable}" = X"YES" ]; then + echo -n ' mrouted'; mrouted ${mrouted_flags} fi + if [ "X$rarpd_enable" = X"YES" ]; then echo -n ' rarpd'; rarpd ${rarpd_flags} fi - echo '.' network_pass1_done=YES # Let future generations know we made it. } @@ -220,7 +225,6 @@ network_pass3() { fi mountd ${mountd_flags} if [ "X${nfs_reserved_port_only}" = X"YES" ]; then - echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi echo -n ' nfsd'; nfsd ${nfs_server_flags} @@ -264,11 +268,6 @@ network_pass3() { unset stash_flag fi - # IP multicast routing daemon - if [ "X${mrouted_enable}" = X"YES" ]; then - echo -n ' mrouted'; mrouted ${mrouted_flags} - fi - # Network Address Translation daemon if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then if [ -a "X${firewall_enable}" = X"YES" ]; then |