From 873d0283bc5398dc475168d2628e52d58829c1c5 Mon Sep 17 00:00:00 2001 From: mtm Date: Fri, 29 Aug 2003 13:25:08 +0000 Subject: Remove deprecated files no longer neccesary as part of rc.d. Include a note in UPDATING about removing them from current installations. --- etc/rc.d/Makefile | 3 +- etc/rc.d/localdaemons | 90 -------------------- etc/rc.d/network1 | 226 -------------------------------------------------- etc/rc.d/network2 | 140 ------------------------------- etc/rc.d/network3 | 36 -------- 5 files changed, 1 insertion(+), 494 deletions(-) delete mode 100644 etc/rc.d/localdaemons delete mode 100644 etc/rc.d/network1 delete mode 100644 etc/rc.d/network2 delete mode 100644 etc/rc.d/network3 (limited to 'etc') diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index c1e4d74..b25b5cd 100755 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -19,11 +19,10 @@ FILES= DAEMON LOGIN NETWORKING SERVERS \ ipnat ipsec ipxrouted isdnd \ jail \ kadmind kerberos keyserv kldxref kpasswdd \ - ldconfig local localdaemons localpkg lomac lpd \ + ldconfig local localpkg lomac lpd \ motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs \ named netif netoptions \ - network1 network2 network3 \ network_ipv6 nfsclient nfsd \ nfslocking nfsserver nisdomain ntpd ntpdate \ othermta \ diff --git a/etc/rc.d/localdaemons b/etc/rc.d/localdaemons deleted file mode 100644 index dfd93f4..0000000 --- a/etc/rc.d/localdaemons +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: localdaemons -# REQUIRE: abi -# BEFORE: securelevel -# KEYWORD: FreeBSD nostart - -. /etc/rc.subr - -name="localdaemons" -start_cmd="locald_start" -stop_cmd="locald_stop" - -locald_start() -{ - # For each dir in $local_startup, search for init scripts matching *.sh - # - case ${local_startup} in - [Nn][Oo] | '') - ;; - *) - echo -n 'Local package initialization:' - slist="" - if [ -z "${script_name_sep}" ]; then - script_name_sep=" " - fi - for dir in ${local_startup}; do - if [ -d "${dir}" ]; then - for script in ${dir}/*.sh; do - slist="${slist}${script_name_sep}${script}" - done - fi - done - script_save_sep="$IFS" - IFS="${script_name_sep}" - for script in ${slist}; do - if [ -x "${script}" ]; then - (set -T - trap 'exit 1' 2 - ${script} start) - elif [ -f "${script}" -o -L "${script}" ]; then - echo -n " (skipping ${script##*/}, not executable)" - fi - done - IFS="${script_save_sep}" - echo '.' - ;; - esac -} - -locald_stop() -{ - echo -n 'Shutting down daemon processes:' - - # For each dir in $local_startup, search for init scripts matching *.sh - case ${local_startup} in - [Nn][Oo] | '') - ;; - *) - slist="" - if [ -z "${script_name_sep}" ]; then - script_name_sep=" " - fi - for dir in ${local_startup}; do - if [ -d "${dir}" ]; then - for script in ${dir}/*.sh; do - slist="${slist}${script_name_sep}${script}" - done - fi - done - script_save_sep="$IFS" - IFS="${script_name_sep}" - for script in `reverse_list ${slist}`; do - if [ -x "${script}" ]; then - (set -T - trap 'exit 1' 2 - ${script} stop) - fi - done - IFS="${script_save_sep}" - echo '.' - ;; - esac -} - -load_rc_config $name -run_rc_command "$1" diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 deleted file mode 100644 index 62f002a..0000000 --- a/etc/rc.d/network1 +++ /dev/null @@ -1,226 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: network1 -# REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl tty -# KEYWORD: FreeBSD nostart - -. /etc/rc.subr - -name="network1" -start_cmd="network_start" -stop_cmd="network_stop" - -convert_host_conf() -{ - host_conf=$1; shift; - nsswitch_conf=$1; shift; - awk ' \ - /^[:blank:]*#/ { next } \ - /(hosts|local|file)/ { nsswitch[c] = "files"; c++; next } \ - /(dns|bind)/ { nsswitch[c] = "dns"; c++; next } \ - /nis/ { nsswitch[c] = "nis"; c++; next } \ - { printf "Warning: unrecognized line [%s]", $0 > "/dev/stderr" } \ - END { \ - printf "hosts: "; \ - for (i in nsswitch) printf "%s ", nsswitch[i]; \ - printf "\n"; \ - }' < $host_conf > $nsswitch_conf -} - -generate_host_conf() -{ - nsswitch_conf=$1; shift; - host_conf=$1; shift; - - awk ' - BEGIN { - xlat["files"] = "hosts"; - xlat["dns"] = "bind"; - xlat["nis"] = "nis"; - cont = 0; - } - sub(/^[\t ]*hosts:/, "") || cont { - if (!cont) - srcs = "" - sub(/#.*/, "") - gsub(/[][]/, " & ") - cont = sub(/\\$/, "") - srcs = srcs " " $0 - } - END { - print "# Auto-generated from nsswitch.conf, do not edit" - ns = split(srcs, s) - for (n = 1; n <= ns; ++n) { - if (s[n] in xlat) - print xlat[s[n]] - } - } - ' <$nsswitch_conf >$host_conf -} - -network_gif_setup() { - case ${gif_interfaces} in - [Nn][Oo] | '') - ;; - *) - for i in ${gif_interfaces}; do - eval peers=\$gifconfig_$i - case ${peers} in - '') - continue - ;; - *) - ifconfig $i create >/dev/null 2>&1 - ifconfig $i tunnel ${peers} - ifconfig $i up - ;; - esac - done - ;; - esac -} - -network_start() -{ - # set hostname, turn on network - # - echo -n "Doing initial network setup:" - - # Generate host.conf for compatibility - # - if [ -f "/etc/nsswitch.conf" ]; then - echo -n ' host.conf' - generate_host_conf /etc/nsswitch.conf /etc/host.conf - fi - - # Convert host.conf to nsswitch.conf if necessary - # - if [ -f "/etc/host.conf" -a ! -f "/etc/nsswitch.conf" ]; then - echo '' - echo 'Warning: /etc/host.conf is no longer used' - echo ' /etc/nsswitch.conf will be created for you' - convert_host_conf /etc/host.conf /etc/nsswitch.conf - fi - - # Set the host name if it is not already set - # - if [ -z "`hostname -s`" ]; then - hostname ${hostname} - echo -n ' hostname' - fi - - # Set the domainname if we're using NIS - # - case ${nisdomainname} in - [Nn][Oo]|'') - ;; - *) - domainname ${nisdomainname} - echo -n ' domain' - ;; - esac - - echo '.' - - # Attempt to create cloned interfaces. - for ifn in ${cloned_interfaces}; do - ifconfig ${ifn} create - done - - # gifconfig - network_gif_setup - - # Set up all the network interfaces, calling startup scripts if needed - # - case ${network_interfaces} in - [Aa][Uu][Tt][Oo]) - network_interfaces="`ifconfig -l`" - ;; - *) - network_interfaces="${network_interfaces} ${cloned_interfaces}" - ;; - esac - - dhcp_interfaces="" - for ifn in ${network_interfaces}; do - if [ -r /etc/start_if.${ifn} ]; then - . /etc/start_if.${ifn} - eval showstat_$ifn=1 - fi - - # Do the primary ifconfig if specified - # - eval ifconfig_args=\$ifconfig_${ifn} - - case ${ifconfig_args} in - '') - ;; - [Dd][Hh][Cc][Pp]) - # DHCP inits are done all in one go below - dhcp_interfaces="$dhcp_interfaces $ifn" - eval showstat_$ifn=1 - ;; - *) - ifconfig ${ifn} ${ifconfig_args} - eval showstat_$ifn=1 - ;; - esac - done - - if [ ! -z "${dhcp_interfaces}" ]; then - ${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces} - fi - - for ifn in ${network_interfaces}; do - # Check to see if aliases need to be added - # - alias=0 - while : ; do - eval ifconfig_args=\$ifconfig_${ifn}_alias${alias} - if [ -n "${ifconfig_args}" ]; then - ifconfig ${ifn} ${ifconfig_args} alias - eval showstat_$ifn=1 - alias=$((${alias} + 1)) - else - break; - fi - done - - # Do ipx address if specified - # - eval ifconfig_args=\$ifconfig_${ifn}_ipx - if [ -n "${ifconfig_args}" ]; then - ifconfig ${ifn} ${ifconfig_args} - eval showstat_$ifn=1 - fi - done - - # Display ifconfiged interfaces - for ifn in ${network_interfaces}; do - eval showstat=\$showstat_${ifn} - if [ ! -z ${showstat} ]; then - ifconfig ${ifn} - fi - done - - # Resync ipfilter - /etc/rc.d/ipfilter resync -} - -network_stop() -{ - echo -n "Stopping network:" - - # flush routes - # - echo -n " flush routes" - route -n flush - - echo '.' -} - -load_rc_config $name -run_rc_command "$1" diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 deleted file mode 100644 index d162575..0000000 --- a/etc/rc.d/network2 +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh -# -# Configure routing and miscellaneous network tunables -# -# $FreeBSD$ -# - -# PROVIDE: network2 -# REQUIRE: netif ppp-user -# KEYWORD: FreeBSD nostart - -. /etc/rc.subr - -name="network2" -start_cmd="network2_start" -stop_cmd=":" - -network2_start() -{ - case ${defaultrouter} in - [Nn][Oo] | '') - ;; - *) - static_routes="default ${static_routes}" - route_default="default ${defaultrouter}" - ;; - esac - - # Setup static routes. This should be done before router discovery. - # - if [ -n "${static_routes}" ]; then - for i in ${static_routes}; do - eval route_args=\$route_${i} - route add ${route_args} - done - fi - - echo -n 'Additional routing options:' - case ${tcp_extensions} in - [Yy][Ee][Ss] | '') - ;; - *) - echo -n ' tcp extensions=NO' - sysctl net.inet.tcp.rfc1323=0 >/dev/null - ;; - esac - - case ${icmp_bmcastecho} in - [Yy][Ee][Ss]) - echo -n ' broadcast ping responses=YES' - sysctl net.inet.icmp.bmcastecho=1 >/dev/null - ;; - esac - - case ${icmp_drop_redirect} in - [Yy][Ee][Ss]) - echo -n ' ignore ICMP redirect=YES' - sysctl net.inet.icmp.drop_redirect=1 >/dev/null - ;; - esac - - case ${icmp_log_redirect} in - [Yy][Ee][Ss]) - echo -n ' log ICMP redirect=YES' - sysctl net.inet.icmp.log_redirect=1 >/dev/null - ;; - esac - - case ${gateway_enable} in - [Yy][Ee][Ss]) - echo -n ' IP gateway=YES' - sysctl net.inet.ip.forwarding=1 >/dev/null - ;; - esac - - case ${forward_sourceroute} in - [Yy][Ee][Ss]) - echo -n ' do source routing=YES' - sysctl net.inet.ip.sourceroute=1 >/dev/null - ;; - esac - - case ${accept_sourceroute} in - [Yy][Ee][Ss]) - echo -n ' accept source routing=YES' - sysctl net.inet.ip.accept_sourceroute=1 >/dev/null - ;; - esac - - case ${tcp_keepalive} in - [Nn][Oo]) - echo -n ' TCP keepalive=NO' - sysctl net.inet.tcp.always_keepalive=0 >/dev/null - ;; - esac - - case ${tcp_drop_synfin} in - [Yy][Ee][Ss]) - echo -n ' drop SYN+FIN packets=YES' - sysctl net.inet.tcp.drop_synfin=1 >/dev/null - ;; - esac - - case ${ipxgateway_enable} in - [Yy][Ee][Ss]) - echo -n ' IPX gateway=YES' - sysctl net.ipx.ipx.ipxforwarding=1 >/dev/null - ;; - esac - - case ${arpproxy_all} in - [Yy][Ee][Ss]) - echo -n ' ARP proxyall=YES' - sysctl net.link.ether.inet.proxyall=1 >/dev/null - ;; - esac - - case ${ip_portrange_first} in - [Nn][Oo] | '') - ;; - *) - echo -n " ip_portrange_first=$ip_portrange_first" - sysctl net.inet.ip.portrange.first=$ip_portrange_first >/dev/null - ;; - esac - - case ${ip_portrange_last} in - [Nn][Oo] | '') - ;; - *) - echo -n " ip_portrange_last=$ip_portrange_last" - sysctl net.inet.ip.portrange.last=$ip_portrange_last >/dev/null - ;; - esac - - echo '.' -} - -load_rc_config $name -run_rc_command "$1" diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 deleted file mode 100644 index 5dc7495..0000000 --- a/etc/rc.d/network3 +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: network3 -# REQUIRE: localdaemons -# BEFORE: securelevel -# KEYWORD: FreeBSD nostart - -. /etc/rc.subr - -load_rc_config 'XXX' - -echo -n 'Additional TCP options:' -case ${log_in_vain} in -[Nn][Oo] | '') - log_in_vain=0 - ;; -[Yy][Ee][Ss]) - log_in_vain=1 - ;; -[0-9]*) - ;; -*) - echo " invalid log_in_vain setting: ${log_in_vain}" - log_in_vain=0 - ;; -esac - -[ "${log_in_vain}" -ne 0 ] && ( - echo -n " log_in_vain=${log_in_vain}" - sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null -) -echo '.' -- cgit v1.1