diff options
author | jkh <jkh@FreeBSD.org> | 1997-05-19 07:46:51 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-05-19 07:46:51 +0000 |
commit | eca8c2300f1cee399e1067babe0cd5c755a6b17d (patch) | |
tree | cf2a40c15c994ec77bd66619ac5a5e67ef5c169b | |
parent | 94f9f7a6691325b00b2d5a5a0639b6565a624633 (diff) | |
download | FreeBSD-src-eca8c2300f1cee399e1067babe0cd5c755a6b17d.zip FreeBSD-src-eca8c2300f1cee399e1067babe0cd5c755a6b17d.tar.gz |
Neaten up some things which were inconsistent, add a few more flags
to things which need them, general cleanup.
Submitted by: Brian Somers <brian@awfulhak.org>
-rw-r--r-- | etc/etc.amd64/rc.amd64 | 6 | ||||
-rw-r--r-- | etc/etc.i386/rc.i386 | 6 | ||||
-rw-r--r-- | etc/network.subr | 6 | ||||
-rw-r--r-- | etc/rc | 4 | ||||
-rw-r--r-- | etc/rc.conf | 12 | ||||
-rw-r--r-- | etc/rc.d/netoptions | 6 | ||||
-rw-r--r-- | etc/rc.d/network1 | 6 | ||||
-rw-r--r-- | etc/rc.d/network2 | 6 | ||||
-rw-r--r-- | etc/rc.d/network3 | 6 | ||||
-rw-r--r-- | etc/rc.d/routing | 6 | ||||
-rw-r--r-- | etc/rc.network | 6 |
11 files changed, 37 insertions, 33 deletions
diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64 index 352b535..f1d322a 100644 --- a/etc/etc.amd64/rc.amd64 +++ b/etc/etc.amd64/rc.amd64 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.18.2.3 1997/04/28 10:07:00 jkh Exp $ +# $Id: rc.i386,v 1.25 1997/05/03 11:22:17 jkh Exp $ # Do i386 specific processing # @@ -99,9 +99,9 @@ if [ "X${saver}" != X"NO" ] ; then fi # mouse daemon -if [ "X${mousedtype}" != XNO ] ; then +if [ "X${moused_type}" != XNO ] ; then echo -n ' moused' - moused ${mousedflags} -p ${mousedport} -t ${mousedtype} + moused ${moused_flags} -p ${moused_port} -t ${moused_type} fi echo '.' diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386 index 352b535..f1d322a 100644 --- a/etc/etc.i386/rc.i386 +++ b/etc/etc.i386/rc.i386 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.18.2.3 1997/04/28 10:07:00 jkh Exp $ +# $Id: rc.i386,v 1.25 1997/05/03 11:22:17 jkh Exp $ # Do i386 specific processing # @@ -99,9 +99,9 @@ if [ "X${saver}" != X"NO" ] ; then fi # mouse daemon -if [ "X${mousedtype}" != XNO ] ; then +if [ "X${moused_type}" != XNO ] ; then echo -n ' moused' - moused ${mousedflags} -p ${mousedport} -t ${mousedtype} + moused ${moused_flags} -p ${moused_port} -t ${moused_type} fi echo '.' diff --git a/etc/network.subr b/etc/network.subr index d44043e..398b867 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $ +# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -170,7 +170,7 @@ network_pass3() { echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi - echo -n ' nfsd'; nfsd -u -t 4 + echo -n ' nfsd'; nfsd ${nfs_server_flags} if [ "X$rpc_lockd_enable" = X"YES" ]; then echo -n ' rpc.lockd'; rpc.lockd fi @@ -180,7 +180,7 @@ network_pass3() { fi if [ "X${nfs_client_enable}" = X"YES" ]; then - echo -n ' nfsiod'; nfsiod -n 4 + echo -n ' nfsiod'; nfsiod ${nfs_client_flags} fi if [ "X${amd_enable}" = X"YES" ]; then @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.122 1997/05/05 07:08:30 jkh Exp $ +# $Id: rc,v 1.123 1997/05/07 12:35:03 jkh Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -221,7 +221,7 @@ echo -n ' inetd'; inetd ${inetd_flags} echo -n ' cron'; cron if [ "X${lpd_enable}" = X"YES" ]; then - echo -n ' printer'; lpd + echo -n ' printer'; lpd ${lpd_flags} fi if [ "X${sendmail_enable}" = X"YES" -a -r /etc/sendmail.cf ]; then diff --git a/etc/rc.conf b/etc/rc.conf index 88b7bc6..e77999b 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -6,7 +6,7 @@ # # All arguments must be in double or single quotes. # -# $Id: rc.conf,v 1.9 1997/05/13 08:22:27 jkh Exp $ +# $Id: rc.conf,v 1.10 1997/05/19 03:20:22 jkh Exp $ ############################################################## ### Important initial Boot-time options ##################### @@ -31,6 +31,7 @@ firewall="NO" # Set to firewall type or NO for none. tcp_extensions="YES" # Allow RFC1323 & RFC1544 extensions (or NO). network_interfaces="lo0" # List of network interfaces (lo0 is loopback). ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. +#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. ### Network daemon (miscellaneous) & NFS options: ### syslogd_enable="YES" # Run syslog daemon (or NO). @@ -43,7 +44,9 @@ rwhod_enable="NO" # Run the rwho daemon (or NO). amd_enable="NO" # Run amd service with $amd_flags (or NO). amd_flags="-a /net -c 1800 -k i386 -d my.domain -l syslog /host /etc/amd.map" nfs_client_enable="NO" # This host is an NFS client (or NO). +nfs_client_flags="-n 4" # Flags to nfsiod (if enabled). nfs_server_enable="NO" # This host is an NFS server (or NO). +nfs_server_flags="-u -t 4" # Flags to nfsd (if enabled). weak_mountd_authentication="NO" # Running PCNFSD / other non-root nfsd (or NO). nfs_reserved_port_only="NO" # Provide NFS only on secure port (or NO). rpc_lockd_enable="NO" # Run NFS rpc.lockd (*broken!*) if nfs_server. @@ -104,9 +107,9 @@ font8x14="NO" # font 8x14 from /usr/share/syscons/fonts/* (or NO). font8x8="NO" # font 8x8 from /usr/share/syscons/fonts/* (or NO). blanktime="NO" # blank time (in seconds) or "NO" to turn it off. saver="NO" # screen saver desired: blank/green/snake/star/NO. -mousedtype="NO" # See man page for rc.conf(8) for available settings. -mousedport="/dev/cuaa0" # Set to your mouse port (required if mousetype set) -mousedflags="" # Any additional flags to moused. +moused_type="NO" # See man page for rc.conf(8) for available settings. +moused_port="/dev/cuaa0"# Set to your mouse port (required if mousetype set) +moused_flags="" # Any additional flags to moused. ############################################################## @@ -114,6 +117,7 @@ mousedflags="" # Any additional flags to moused. ############################################################## lpd_enable="YES" # Run the line printer daemon +lpd_flags="" # Flags to lpd (if enabled). sendmail_enable="YES" # Run the sendmail daemon (or NO). sendmail_flags="-bd -q30m" # -bd is pretty mandatory savecore_enable="NO" # Save kernel crashdumps for debugging (or NO). diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index d44043e..398b867 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $ +# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -170,7 +170,7 @@ network_pass3() { echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi - echo -n ' nfsd'; nfsd -u -t 4 + echo -n ' nfsd'; nfsd ${nfs_server_flags} if [ "X$rpc_lockd_enable" = X"YES" ]; then echo -n ' rpc.lockd'; rpc.lockd fi @@ -180,7 +180,7 @@ network_pass3() { fi if [ "X${nfs_client_enable}" = X"YES" ]; then - echo -n ' nfsiod'; nfsiod -n 4 + echo -n ' nfsiod'; nfsiod ${nfs_client_flags} fi if [ "X${amd_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index d44043e..398b867 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $ +# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -170,7 +170,7 @@ network_pass3() { echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi - echo -n ' nfsd'; nfsd -u -t 4 + echo -n ' nfsd'; nfsd ${nfs_server_flags} if [ "X$rpc_lockd_enable" = X"YES" ]; then echo -n ' rpc.lockd'; rpc.lockd fi @@ -180,7 +180,7 @@ network_pass3() { fi if [ "X${nfs_client_enable}" = X"YES" ]; then - echo -n ' nfsiod'; nfsiod -n 4 + echo -n ' nfsiod'; nfsiod ${nfs_client_flags} fi if [ "X${amd_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index d44043e..398b867 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $ +# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -170,7 +170,7 @@ network_pass3() { echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi - echo -n ' nfsd'; nfsd -u -t 4 + echo -n ' nfsd'; nfsd ${nfs_server_flags} if [ "X$rpc_lockd_enable" = X"YES" ]; then echo -n ' rpc.lockd'; rpc.lockd fi @@ -180,7 +180,7 @@ network_pass3() { fi if [ "X${nfs_client_enable}" = X"YES" ]; then - echo -n ' nfsiod'; nfsiod -n 4 + echo -n ' nfsiod'; nfsiod ${nfs_client_flags} fi if [ "X${amd_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index d44043e..398b867 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $ +# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -170,7 +170,7 @@ network_pass3() { echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi - echo -n ' nfsd'; nfsd -u -t 4 + echo -n ' nfsd'; nfsd ${nfs_server_flags} if [ "X$rpc_lockd_enable" = X"YES" ]; then echo -n ' rpc.lockd'; rpc.lockd fi @@ -180,7 +180,7 @@ network_pass3() { fi if [ "X${nfs_client_enable}" = X"YES" ]; then - echo -n ' nfsiod'; nfsiod -n 4 + echo -n ' nfsiod'; nfsiod ${nfs_client_flags} fi if [ "X${amd_enable}" = X"YES" ]; then diff --git a/etc/rc.d/routing b/etc/rc.d/routing index d44043e..398b867 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $ +# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -170,7 +170,7 @@ network_pass3() { echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi - echo -n ' nfsd'; nfsd -u -t 4 + echo -n ' nfsd'; nfsd ${nfs_server_flags} if [ "X$rpc_lockd_enable" = X"YES" ]; then echo -n ' rpc.lockd'; rpc.lockd fi @@ -180,7 +180,7 @@ network_pass3() { fi if [ "X${nfs_client_enable}" = X"YES" ]; then - echo -n ' nfsiod'; nfsiod -n 4 + echo -n ' nfsiod'; nfsiod ${nfs_client_flags} fi if [ "X${amd_enable}" = X"YES" ]; then diff --git a/etc/rc.network b/etc/rc.network index d44043e..398b867 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $ +# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -170,7 +170,7 @@ network_pass3() { echo -n ' nfsprivport=YES' sysctl -w vfs.nfs.nfs_privport=1 >/dev/null 2>&1 fi - echo -n ' nfsd'; nfsd -u -t 4 + echo -n ' nfsd'; nfsd ${nfs_server_flags} if [ "X$rpc_lockd_enable" = X"YES" ]; then echo -n ' rpc.lockd'; rpc.lockd fi @@ -180,7 +180,7 @@ network_pass3() { fi if [ "X${nfs_client_enable}" = X"YES" ]; then - echo -n ' nfsiod'; nfsiod -n 4 + echo -n ' nfsiod'; nfsiod ${nfs_client_flags} fi if [ "X${amd_enable}" = X"YES" ]; then |