diff options
author | jkh <jkh@FreeBSD.org> | 1997-05-03 11:22:17 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-05-03 11:22:17 +0000 |
commit | af4383e1b67df81e99a9fce13089d834220e8928 (patch) | |
tree | 306b768e5faa6abdc6ab38cba90ee8df594be76c | |
parent | fe8101c0866e92737fd07af50822dd6c8f0ceed8 (diff) | |
download | FreeBSD-src-af4383e1b67df81e99a9fce13089d834220e8928.zip FreeBSD-src-af4383e1b67df81e99a9fce13089d834220e8928.tar.gz |
Update the etc world from RELENG_2_2 which is now more up-to-date
(gotta get myself -current again, this is a drag).
Also-fixes-problems-noted-by: Wolfgang Helbig & Joerg Wunsch
-rw-r--r-- | etc/etc.amd64/rc.amd64 | 7 | ||||
-rw-r--r-- | etc/etc.i386/rc.i386 | 7 | ||||
-rw-r--r-- | etc/network.subr | 10 | ||||
-rw-r--r-- | etc/rc | 38 | ||||
-rw-r--r-- | etc/rc.conf | 6 | ||||
-rw-r--r-- | etc/rc.d/netoptions | 10 | ||||
-rw-r--r-- | etc/rc.d/network1 | 10 | ||||
-rw-r--r-- | etc/rc.d/network2 | 10 | ||||
-rw-r--r-- | etc/rc.d/network3 | 10 | ||||
-rw-r--r-- | etc/rc.d/pccard | 4 | ||||
-rw-r--r-- | etc/rc.d/routing | 10 | ||||
-rw-r--r-- | etc/rc.firewall | 8 | ||||
-rw-r--r-- | etc/rc.network | 10 | ||||
-rw-r--r-- | etc/rc.pccard | 4 |
14 files changed, 39 insertions, 105 deletions
diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64 index c25991c..352b535 100644 --- a/etc/etc.amd64/rc.amd64 +++ b/etc/etc.amd64/rc.amd64 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.23 1997/04/28 05:51:57 jkh Exp $ +# $Id: rc.i386,v 1.18.2.3 1997/04/28 10:07:00 jkh Exp $ # Do i386 specific processing # @@ -50,11 +50,6 @@ if [ "X${keybell}" != X"NO" ]; then echo -n ' keybell'; kbdcontrol <${kbddev} -b ${keybell} fi -# bell style -if [ "X${keybell}" != X"NO" ]; then - echo -n ' keybell'; kbdcontrol <${kbddev} -b ${keybell} -fi - # change function keys if [ "X${keychange}" != X"NO" ]; then echo -n " keychange" diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386 index c25991c..352b535 100644 --- a/etc/etc.i386/rc.i386 +++ b/etc/etc.i386/rc.i386 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.23 1997/04/28 05:51:57 jkh Exp $ +# $Id: rc.i386,v 1.18.2.3 1997/04/28 10:07:00 jkh Exp $ # Do i386 specific processing # @@ -50,11 +50,6 @@ if [ "X${keybell}" != X"NO" ]; then echo -n ' keybell'; kbdcontrol <${kbddev} -b ${keybell} fi -# bell style -if [ "X${keybell}" != X"NO" ]; then - echo -n ' keybell'; kbdcontrol <${kbddev} -b ${keybell} -fi - # change function keys if [ "X${keychange}" != X"NO" ]; then echo -n " keychange" diff --git a/etc/network.subr b/etc/network.subr index 95f04f4..9714eb7 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.4 1997/05/01 20:04:42 jkh Exp $ +# $Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -99,8 +99,8 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - if [ -n "$tcp_extentions" -a "x$tcp_extentions" != "xYES" ] ; then - echo -n ' tcp extentions=NO' + if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then + echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi @@ -109,10 +109,6 @@ network_pass2() { fi if [ "X${ntpdate_enable}" = X"YES" -o "X${xntpd_enable}" = X"YES" ]; then - if [ "X${tickadj_enable}" = X"YES" ]; then - echo -n ' tickadj'; tickadj ${tickadj_flags--Aq} - fi - if [ "X${ntpdate_enable}" = X"YES" ]; then echo -n ' ntpdate'; ntpdate ${ntpdate_flags} >/dev/null 2>&1 fi @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.117 1997/04/27 03:59:13 jkh Exp $ +# $Id: rc,v 1.104.2.11 1997/05/01 06:01:35 jkh Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -132,38 +132,14 @@ rm -f /var/spool/lock/* rm -rf /var/spool/uucp/.Temp/* (cd /var/run && { cp /dev/null utmp; chmod 644 utmp; }) -# -# Clearing /tmp at boot-time is essentially stupid, but seems to have -# a long tradition. It doesn't help in any way for long-living systems, -# and it might accidentally clobber files you would rather like to have -# preserved after a crash (if not using mfs /tmp anyway). -# -# See also the commented out example of another cleanup policy in -# /etc/daily. -# -echo clearing /tmp - -# prune quickly with one rm, then use find to clean up /tmp/[lq]* -# (not needed with mfs /tmp, but doesn't hurt there...) -(cd /tmp && rm -rf [a-km-pr-zA-Z]* && - find -d . ! -name . ! -name lost+found ! -name quotas -exec rm -rf -- {} \;) - -# The above is even more stupid since it prevents you from restarting -# X11 after a system crash. If you disable the above, make sure to -# uncomment the line below. -# -# clean up leftover X lock files and local connection sockets -#rm -f /tmp/.X*-lock /tmp/.X11-unix/* - - # enable dumpdev so that savecore can see it -if [ "X${dumpdev}" != X"NO" ]; then +if [ "X${dumpdev}" != X"NO" -a -e ${dumpdev} ]; then dumpon ${dumpdev} fi # /var/crash should be a directory or a symbolic link # to the crash directory if core dumps are to be saved. -if [ -d /var/crash ]; then +if [ "X${savecore_enable}" = X"YES" -a -d /var/crash ]; then echo -n checking for core dump... savecore /var/crash fi @@ -176,9 +152,7 @@ echo -n 'additional daemons:' # start system logging and name service (named needs to start before syslogd # if you don't have a /etc/resolv.conf) # -# If syslogdflags == NO, syslog isn't run -if [ "X${syslogdflags}" != X"NO" ] ; then - +if [ "X${syslogd_enable}" = X"YES" ]; then # Transitional symlink (for the next couple of years :) until all # binaries had a chance to move towards /var/run/log. if [ ! -h /dev/log ] ; then @@ -191,7 +165,7 @@ if [ "X${syslogdflags}" != X"NO" ] ; then fi if [ "X${tickadj_enable}" = X"YES" ]; then - echo -n ' tickadj'; tickadj ${tickadj_flags--Aq} + echo -n ' tickadj'; tickadj ${tickadj_flags--Aq} fi echo '.' @@ -226,7 +200,7 @@ fi if [ "X${accounting_enable}" = X"YES" -a -d /var/account ]; then echo 'turning on accounting' if [ ! -e /var/account/acct ]; then - touch /var/account/acct && chmod 600 /var/account/acct + touch /var/account/acct fi accton /var/account/acct fi diff --git a/etc/rc.conf b/etc/rc.conf index a0770c1..7644a50 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.4 1997/04/28 10:07:21 jkh Exp $ +# $Id: rc.conf,v 1.1.2.5 1997/05/01 23:42:19 jkh Exp $ ############################################################## ### Important initial Boot-time options ##################### @@ -28,7 +28,7 @@ local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. hostname="myname.my.domain" # Set this! nisdomainname="NO" # Set to NIS domain if using NIS (or NO). firewall="NO" # Set to firewall type or NO for none. -tcp_extentions="YES" # Allow RFC1323 & RFC1544 extentions (or NO). +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. @@ -59,7 +59,7 @@ ntpdate_enable="NO" # Run the ntpdate to sync time (or NO). ntpdate_flags="" # Flags to ntpdate (if enabled). xntpd_enable="NO" # Run xntpd Network Time Protocol (or NO). xntpd_flags="" # Flags to xntpd (if enabled). -tickadj_enable="YES" # If xntp is enabled, also run tickadj. +tickadj_enable="NO" # Run tickadj (or NO). tickadj_flags="-Aq" # Flags to tickadj (if enabled). # Network Information Services (NIS) options: ### diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 95f04f4..9714eb7 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.4 1997/05/01 20:04:42 jkh Exp $ +# $Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -99,8 +99,8 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - if [ -n "$tcp_extentions" -a "x$tcp_extentions" != "xYES" ] ; then - echo -n ' tcp extentions=NO' + if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then + echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi @@ -109,10 +109,6 @@ network_pass2() { fi if [ "X${ntpdate_enable}" = X"YES" -o "X${xntpd_enable}" = X"YES" ]; then - if [ "X${tickadj_enable}" = X"YES" ]; then - echo -n ' tickadj'; tickadj ${tickadj_flags--Aq} - fi - if [ "X${ntpdate_enable}" = X"YES" ]; then echo -n ' ntpdate'; ntpdate ${ntpdate_flags} >/dev/null 2>&1 fi diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 95f04f4..9714eb7 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.4 1997/05/01 20:04:42 jkh Exp $ +# $Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -99,8 +99,8 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - if [ -n "$tcp_extentions" -a "x$tcp_extentions" != "xYES" ] ; then - echo -n ' tcp extentions=NO' + if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then + echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi @@ -109,10 +109,6 @@ network_pass2() { fi if [ "X${ntpdate_enable}" = X"YES" -o "X${xntpd_enable}" = X"YES" ]; then - if [ "X${tickadj_enable}" = X"YES" ]; then - echo -n ' tickadj'; tickadj ${tickadj_flags--Aq} - fi - if [ "X${ntpdate_enable}" = X"YES" ]; then echo -n ' ntpdate'; ntpdate ${ntpdate_flags} >/dev/null 2>&1 fi diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 95f04f4..9714eb7 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.4 1997/05/01 20:04:42 jkh Exp $ +# $Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -99,8 +99,8 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - if [ -n "$tcp_extentions" -a "x$tcp_extentions" != "xYES" ] ; then - echo -n ' tcp extentions=NO' + if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then + echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi @@ -109,10 +109,6 @@ network_pass2() { fi if [ "X${ntpdate_enable}" = X"YES" -o "X${xntpd_enable}" = X"YES" ]; then - if [ "X${tickadj_enable}" = X"YES" ]; then - echo -n ' tickadj'; tickadj ${tickadj_flags--Aq} - fi - if [ "X${ntpdate_enable}" = X"YES" ]; then echo -n ' ntpdate'; ntpdate ${ntpdate_flags} >/dev/null 2>&1 fi diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 95f04f4..9714eb7 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.4 1997/05/01 20:04:42 jkh Exp $ +# $Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -99,8 +99,8 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - if [ -n "$tcp_extentions" -a "x$tcp_extentions" != "xYES" ] ; then - echo -n ' tcp extentions=NO' + if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then + echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi @@ -109,10 +109,6 @@ network_pass2() { fi if [ "X${ntpdate_enable}" = X"YES" -o "X${xntpd_enable}" = X"YES" ]; then - if [ "X${tickadj_enable}" = X"YES" ]; then - echo -n ' tickadj'; tickadj ${tickadj_flags--Aq} - fi - if [ "X${ntpdate_enable}" = X"YES" ]; then echo -n ' ntpdate'; ntpdate ${ntpdate_flags} >/dev/null 2>&1 fi diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard index 3b254de..c0ef84d 100644 --- a/etc/rc.d/pccard +++ b/etc/rc.d/pccard @@ -10,6 +10,6 @@ if [ "X$pccard_enable" = X"YES" ] ; then else pccardc pccardmem 0xd0000 fi - echo "Enable PC-card." - pccardd & + echo -n "Enable PC-card." + pccardd 2>&1 > /var/log/pccardd.debug & fi diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 95f04f4..9714eb7 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.4 1997/05/01 20:04:42 jkh Exp $ +# $Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -99,8 +99,8 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - if [ -n "$tcp_extentions" -a "x$tcp_extentions" != "xYES" ] ; then - echo -n ' tcp extentions=NO' + if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then + echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi @@ -109,10 +109,6 @@ network_pass2() { fi if [ "X${ntpdate_enable}" = X"YES" -o "X${xntpd_enable}" = X"YES" ]; then - if [ "X${tickadj_enable}" = X"YES" ]; then - echo -n ' tickadj'; tickadj ${tickadj_flags--Aq} - fi - if [ "X${ntpdate_enable}" = X"YES" ]; then echo -n ' ntpdate'; ntpdate ${ntpdate_flags} >/dev/null 2>&1 fi diff --git a/etc/rc.firewall b/etc/rc.firewall index 6bc1a09..abc0183 100644 --- a/etc/rc.firewall +++ b/etc/rc.firewall @@ -1,6 +1,6 @@ ############ # Setup system for firewall service. -# $Id: rc.firewall,v 1.9 1997/04/27 03:59:14 jkh Exp $ +# $Id: rc.firewall,v 1.6.2.1 1997/04/26 22:39:34 jkh Exp $ ############ # @@ -23,7 +23,6 @@ # # O'Reilly & Associates, Inc # ISBN 1-56592-124-0 -# http://www.ora.com # # For a more advanced treatment of Internet Security read: # @@ -33,7 +32,6 @@ # # Addison-Wesley # ISBN 0-201-6337-4 -# http://www.awl.com # ############ @@ -94,7 +92,7 @@ elif [ "${firewall}" = "client" ]; then /sbin/ipfw add pass udp from any 123 to ${ip} /sbin/ipfw add pass udp from ${ip} to any 123 - # Everything else is denied as default. + # Everyting else is denied as default. elif [ "${firewall}" = "simple" ]; then @@ -151,6 +149,6 @@ elif [ "${firewall}" = "simple" ]; then /sbin/ipfw add pass udp from any 123 to ${oip} /sbin/ipfw add pass udp from ${oip} to any 123 - # Everything else is denied as default. + # Everyting else is denied as default. fi diff --git a/etc/rc.network b/etc/rc.network index 95f04f4..9714eb7 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.4 1997/05/01 20:04:42 jkh Exp $ +# $Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -99,8 +99,8 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - if [ -n "$tcp_extentions" -a "x$tcp_extentions" != "xYES" ] ; then - echo -n ' tcp extentions=NO' + if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then + echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi @@ -109,10 +109,6 @@ network_pass2() { fi if [ "X${ntpdate_enable}" = X"YES" -o "X${xntpd_enable}" = X"YES" ]; then - if [ "X${tickadj_enable}" = X"YES" ]; then - echo -n ' tickadj'; tickadj ${tickadj_flags--Aq} - fi - if [ "X${ntpdate_enable}" = X"YES" ]; then echo -n ' ntpdate'; ntpdate ${ntpdate_flags} >/dev/null 2>&1 fi diff --git a/etc/rc.pccard b/etc/rc.pccard index 3b254de..c0ef84d 100644 --- a/etc/rc.pccard +++ b/etc/rc.pccard @@ -10,6 +10,6 @@ if [ "X$pccard_enable" = X"YES" ] ; then else pccardc pccardmem 0xd0000 fi - echo "Enable PC-card." - pccardd & + echo -n "Enable PC-card." + pccardd 2>&1 > /var/log/pccardd.debug & fi |