diff options
| -rw-r--r-- | ObsoleteFiles.inc | 4 | ||||
| -rw-r--r-- | etc/defaults/rc.conf | 12 | ||||
| -rwxr-xr-x | etc/netstart | 3 | ||||
| -rw-r--r-- | etc/network.subr | 7 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 8 | ||||
| -rwxr-xr-x | etc/rc.d/atm1 | 176 | ||||
| -rwxr-xr-x | etc/rc.d/atm2 | 97 | ||||
| -rwxr-xr-x | etc/rc.d/atm3 | 93 | ||||
| -rwxr-xr-x | etc/rc.d/routing | 33 | ||||
| -rw-r--r-- | rescue/rescue/Makefile | 3 | ||||
| -rw-r--r-- | share/man/man5/rc.conf.5 | 144 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 15 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 24 | ||||
| -rw-r--r-- | usr.bin/kdump/kdump.c | 2 |
14 files changed, 6 insertions, 615 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 711058cd8713..2e6dff8a0506 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20170425: NATM configuration support removed +OLD_FILES+=etc/rc.d/atm1 +OLD_FILES+=etc/rc.d/atm2 +OLD_FILES+=etc/rc.d/atm3 # 20170424: NATM support removed OLD_FILES+=rescue/atmconfig OLD_FILES+=sbin/atmconfig diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index b79f3831f7d2..b8ae9596e6bb 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -408,7 +408,6 @@ defaultrouter="NO" # Set to default gateway (or NO). static_arp_pairs="" # Set to static ARP list (or leave empty). static_ndp_pairs="" # Set to static NDP list (or leave empty). static_routes="" # Set to static route list (or leave empty). -natm_static_routes="" # Set to static route list for NATM (or leave empty). gateway_enable="NO" # Set to YES if this host will be a gateway. routed_enable="NO" # Set to YES to enable a routing daemon. routed_program="/sbin/routed" # Name of routing daemon to use if enabled. @@ -417,17 +416,6 @@ arpproxy_all="NO" # replaces obsolete kernel option ARP_PROXYALL. forward_sourceroute="NO" # do source routing (only if gateway_enable is set to "YES") accept_sourceroute="NO" # accept source routed packets to us -### ATM interface options: ### -atm_enable="NO" # Configure ATM interfaces (or NO). -#atm_netif_hea0="atm 1" # Network interfaces for physical interface. -#atm_sigmgr_hea0="uni31" # Signalling manager for physical interface. -#atm_prefix_hea0="ILMI" # NSAP prefix (UNI interfaces only) (or ILMI). -#atm_macaddr_hea0="NO" # Override physical MAC address (or NO). -#atm_arpserver_atm0="0x47.0005.80.999999.9999.9999.9999.999999999999.00" # ATMARP server address (or local). -#atm_scsparp_atm0="NO" # Run SCSP/ATMARP on network interface (or NO). -atm_pvcs="" # Set to PVC list (or leave empty). -atm_arps="" # Set to permanent ARP list (or leave empty). - ### Bluetooth ### hcsecd_enable="NO" # Enable hcsecd(8) (or NO) hcsecd_config="/etc/bluetooth/hcsecd.conf" # hcsecd(8) configuration file diff --git a/etc/netstart b/etc/netstart index a0c595c375a6..fa4ce382e4ff 100755 --- a/etc/netstart +++ b/etc/netstart @@ -44,9 +44,6 @@ _start=quietstart /etc/rc.d/ipnat ${_start} /etc/rc.d/ipfs ${_start} /etc/rc.d/sppp ${_start} -# /etc/rc.d/atm1 ${_start} -# . /etc/rc.d/atm2.sh ${_start} -# . /etc/rc.d/atm3.sh ${_start} /etc/rc.d/netif ${_start} /etc/rc.d/ipsec ${_start} /etc/rc.d/ppp ${_start} diff --git a/etc/network.subr b/etc/network.subr index 2410e2d3c7bf..3ae66c667cd5 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -489,13 +489,6 @@ afexists() inet|inet6) check_kern_features ${_af} ;; - atm) - if [ -x /sbin/atmconfig ]; then - /sbin/atmconfig diag list > /dev/null 2>&1 - else - return 1 - fi - ;; link|ether) return 0 ;; diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 320e550aeb8a..01e21415d53c 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -159,14 +159,6 @@ APM+= apmd APMPACKAGE= apm .endif -.if ${MK_ATM} != "no" -FILESGROUPS+= ATM -ATM+= atm1 -ATM+= atm2 -ATM+= atm3 -ATMPACKAGE= atm -.endif - .if ${MK_AUTOFS} != "no" FILES+= automount FILES+= automountd diff --git a/etc/rc.d/atm1 b/etc/rc.d/atm1 deleted file mode 100755 index da50df0a9e95..000000000000 --- a/etc/rc.d/atm1 +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2000 The FreeBSD Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# $FreeBSD$ -# - -# PROVIDE: atm1 -# REQUIRE: root -# BEFORE: netif -# KEYWORD: nojail - -. /etc/rc.subr - -name="atm" -rcvar="atm_enable" -start_cmd="atm_start" -stop_cmd=":" - -# ATM networking startup script -# -# Initial interface configuration. -# N.B. /usr is not mounted. -# -atm_start() -{ - if [ -n "${natm_interfaces}" ] ; then - # Load the HARP pseudo interface - load_kld if_harp || return 1 - - # Load all the NATM drivers that we need - for natm in ${natm_interfaces} ; do - ifconfig ${natm} up - done - fi - - # Load loadable HARP drivers - for dev in ${atm_load} ; do - load_kld ${dev} || return 1 - done - - # Locate all probed ATM adapters - atmdev=`atm sh stat int | while read dev junk; do - case ${dev} in - hea[0-9] | hea[0-9][0-9]) - echo "${dev} " - ;; - hfa[0-9] | hfa[0-9][0-9]) - echo "${dev} " - ;; - idt[0-9] | idt[0-9][0-9]) - echo "${dev} " - ;; - - # NATM interfaces per pseudo driver - en[0-9] | en[0-9][0-9]) - echo "${dev} " - ;; - fatm[0-9] | fatm[0-9][0-9]) - echo "${dev} " - ;; - hatm[0-9] | hatm[0-9][0-9]) - echo "${dev} " - ;; - patm[0-9] | patm[0-9][0-9]) - echo "${dev} " - ;; - *) - continue - ;; - esac - done` - - if [ -z "${atmdev}" ]; then - echo 'No ATM adapters found' - return 0 - fi - - # Load microcode into FORE adapters (if needed) - if [ `expr "${atmdev}" : '.*hfa.*'` -ne 0 ]; then - fore_dnld - fi - - # Configure physical interfaces - ilmid=0 - for phy in ${atmdev}; do - echo -n "Configuring ATM device ${phy}:" - - # Define network interfaces - eval netif_args=\$atm_netif_${phy} - if [ -n "${netif_args}" ]; then - atm set netif ${phy} ${netif_args} || continue - else - echo ' missing network interface definition' - continue - fi - - # Override physical MAC address - eval macaddr_args=\$atm_macaddr_${phy} - if [ -n "${macaddr_args}" ]; then - case ${macaddr_args} in - [Nn][Oo] | '') - ;; - *) - atm set mac ${phy} ${macaddr_args} || continue - ;; - esac - fi - - # Configure signalling manager - eval sigmgr_args=\$atm_sigmgr_${phy} - if [ -n "${sigmgr_args}" ]; then - atm attach ${phy} ${sigmgr_args} || continue - else - echo ' missing signalling manager definition' - continue - fi - - # Configure UNI NSAP prefix - eval prefix_args=\$atm_prefix_${phy} - if [ `expr "${sigmgr_args}" : '[uU][nN][iI].*'` -ne 0 ]; then - if [ -z "${prefix_args}" ]; then - echo ' missing NSAP prefix for UNI interface' - continue - fi - - case ${prefix_args} in - ILMI) - ilmid=1 - ;; - *) - atm set prefix ${phy} ${prefix_args} || continue - ;; - esac - fi - - atm_phy="${atm_phy} ${phy}" - echo '.' - done - - echo -n 'Starting initial ATM daemons:' - # Start ILMI daemon (if needed) - case ${ilmid} in - 1) - echo -n ' ilmid' - ilmid - ;; - esac - - echo '.' -} - -load_rc_config $name -run_rc_command "$1" diff --git a/etc/rc.d/atm2 b/etc/rc.d/atm2 deleted file mode 100755 index ffb63c35aef5..000000000000 --- a/etc/rc.d/atm2 +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2000 The FreeBSD Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# $FreeBSD$ -# - -# PROVIDE: atm2 -# REQUIRE: atm1 netif -# BEFORE: routing -# KEYWORD: nojail - -# -# Additional ATM interface configuration -# -. /etc/rc.subr - -name="atm2" -rcvar="atm_enable" -start_cmd="atm2_start" -stop_cmd=":" - -atm2_start() -{ - # Configure network interfaces - - # get a list of physical interfaces - atm_phy=`atm show stat int | { read junk ; read junk ; \ - while read dev junk ; do - case ${dev} in - en[0-9] | en[0-9][0-9]) - ;; - *) - echo "${dev} " - ;; - esac - done ; }` - - for phy in ${atm_phy}; do - eval netif_args=\$atm_netif_${phy} - set -- ${netif_args} - # skip unused physical interfaces - if [ $# -lt 2 ] ; then - continue - fi - - netname=$1 - netcnt=$2 - netindx=0 - while [ ${netindx} -lt ${netcnt} ]; do - net="${netname}${netindx}" - netindx=$((${netindx} + 1)) - echo -n " ${net}" - - # Configure atmarp server - eval atmarp_args=\$atm_arpserver_${net} - if [ -n "${atmarp_args}" ]; then - atm set arpserver ${net} ${atmarp_args} || - continue - fi - done - done - echo '.' - - # Define any permanent ARP entries. - if [ -n "${atm_arps}" ]; then - for i in ${atm_arps}; do - eval arp_args=\$atm_arp_${i} - atm add arp ${arp_args} - done - fi -} - -load_rc_config $name -run_rc_command "$1" diff --git a/etc/rc.d/atm3 b/etc/rc.d/atm3 deleted file mode 100755 index 4dbd128b8e85..000000000000 --- a/etc/rc.d/atm3 +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2000 The FreeBSD Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# $FreeBSD$ -# - -# Start ATM daemons - -# PROVIDE: atm3 -# REQUIRE: atm2 -# BEFORE: DAEMON -# KEYWORD: nojail - -. /etc/rc.subr - -name="atm3" -rcvar="atm_enable" -start_cmd="atm3_start" -stop_cmd=":" - -atm3_start() -{ - echo -n 'Starting ATM daemons:' - - # Get a list of network interfaces - atm_nif=`atm sh netif | { read junk ; \ - while read dev junk ; do - echo "${dev} " - done - }` - - for net in ${atm_nif} ; do - eval atmarp_args=\$atm_arpserver_${net} - eval scsparp_args=\$atm_scsparp_${net} - - case ${scsparp_args} in - [Yy][Ee][Ss]) - case ${atmarp_args} in - local) - ;; - *) - warn "${net}: local arpserver required for SCSP" - continue - ;; - esac - - atm_atmarpd="${atm_atmarpd} ${net}" - atm_scspd=1 - ;; - esac - done - - # Start SCSP daemon (if needed) - case ${atm_scspd} in - 1) - echo -n ' scspd' - scspd - ;; - esac - - # Start ATMARP daemon (if needed) - if [ -n "${atm_atmarpd}" ]; then - echo -n ' atmarpd' - atmarpd ${atm_atmarpd} - fi - echo '.' -} - -load_rc_config $name -run_rc_command "$1" diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 2a57fa3b1182..10cb48319a08 100755 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -36,7 +36,7 @@ routing_start() case $_af in ""|[Aa][Ll][Ll]|[Aa][Nn][Yy]) - for _a in inet inet6 atm; do + for _a in inet inet6; do afexists $_a || continue setroutes $_cmd $_a $_if || _ret=1 done @@ -65,7 +65,7 @@ routing_stop() case $_af in ""|[Aa][Ll][Ll]|[Aa][Nn][Yy]) - for _a in inet inet6 atm; do + for _a in inet inet6; do afexists $_a || continue eval static_${_a} delete $_if # When $_if is specified, do not flush routes. @@ -126,11 +126,6 @@ routing_stop_inet6() done } -routing_stop_atm() -{ - return 0 -} - get_fibmod() { local _fibs @@ -289,23 +284,6 @@ static_inet6() sysctl net.inet6.ip6.use_defaultzone=1 } -static_atm() -{ - local _action i route_args - _action=$1 - - if [ -n "${natm_static_routes}" ]; then - for i in ${natm_static_routes}; do - route_args=`get_if_var $i route_IF` - if [ -n "$route_args" ]; then - atmconfig natm ${_action} ${route_args} - else - warn "route_${i} not found." - fi - done - fi -} - ropts_init() { if [ -z "${_ropts_initdone}" ]; then @@ -391,12 +369,5 @@ options_inet6() [ -n "${_ropts_initdone}" ] && echo '.' } -options_atm() -{ - _ropts_initdone= - - [ -n "${_ropts_initdone}" ] && echo '.' -} - load_rc_config $name run_rc_command "$@" diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 56285f72c927..4bbb1ccd2aed 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -156,9 +156,6 @@ CRUNCH_PROGS_sbin+= bsdlabel fdisk CRUNCH_ALIAS_bsdlabel= disklabel .endif -CRUNCH_SRCDIR_atm= ${SRCTOP}/sbin/atm/atm -CRUNCH_SRCDIR_atmconfig= ${SRCTOP}/sbin/atm/atmconfig -CRUNCH_SRCDIR_fore_dnld= ${SRCTOP}/sbin/atm/fore_dnld CRUNCH_SRCDIR_ilmid= ${SRCTOP}/sbin/atm/ilmid CRUNCH_SRCDIR_rtquery= ${SRCTOP}/sbin/routed/rtquery CRUNCH_SRCDIR_ipf= ${SRCTOP}/sbin/ipf/ipf diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index bcc82eab031c..c73b852a62d4 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -2753,19 +2753,6 @@ variable is assumed to exist whose contents will later be passed to a .Dq Nm route Cm add Fl inet6 operation. -.It Va natm_static_routes -.Pq Vt str -The -.Xr natmip 4 -equivalent of -.Va static_routes . -If not empty then for each whitespace separated -.Ar element -in the value, a -.Va route_ Ns Aq Ar element -variable is assumed to exist whose contents will later be passed to a -.Dq Nm atmconfig Cm natm Cm add -operation. .It Va gateway_enable .Pq Vt bool If set to @@ -2946,136 +2933,6 @@ is mutually exclusive to .Va rtsol_flags ; .Va rtsold_enable takes precedence. -.It Va atm_enable -.Pq Vt bool -Set to -.Dq Li YES -to enable the configuration of ATM interfaces at system boot time. -For all of the ATM variables described below, please refer to the -.Xr atm 8 -manual page for further details on the available command parameters. -Also refer to the files in -.Pa /usr/share/examples/atm -for more detailed configuration information. -.It Va atm_load -.Pq Vt str -This is a list of physical ATM interface drivers to load. -Typical values are -.Dq Li hfa_pci -and/or -.Dq Li hea_pci . -.It Va atm_netif_ Ns Aq Ar intf -.Pq Vt str -For the ATM physical interface -.Ar intf , -this variable defines the name prefix and count for the ATM network -interfaces to be created. -The value will be passed as the parameters of an -.Dq Nm atm Cm "set netif" Ar intf -command. -.It Va atm_sigmgr_ Ns Aq Ar intf -.Pq Vt str -For the ATM physical interface -.Ar intf , -this variable defines the ATM signalling manager to be used. -The value will be passed as the parameters of an -.Dq Nm atm Cm attach Ar intf -command. -.It Va atm_prefix_ Ns Aq Ar intf -.Pq Vt str -For the ATM physical interface -.Ar intf , -this variable defines the NSAP prefix for interfaces using a UNI signalling -manager. -If set to -.Dq Li ILMI , -the prefix will automatically be set via the -.Xr ilmid 8 -daemon. -Otherwise, the value will be passed as the parameters of an -.Dq Nm atm Cm "set prefix" Ar intf -command. -.It Va atm_macaddr_ Ns Aq Ar intf -.Pq Vt str -For the ATM physical interface -.Ar intf , -this variable defines the MAC address for interfaces using a UNI signalling -manager. -If set to -.Dq Li NO , -the hardware MAC address contained in the ATM interface card will be used. -Otherwise, the value will be passed as the parameters of an -.Dq Nm atm Cm "set mac" Ar intf -command. -.It Va atm_arpserver_ Ns Aq Ar netif -.Pq Vt str -For the ATM network interface -.Ar netif , -this variable defines the ATM address for a host which is to provide ATMARP -service. -This variable is only applicable to interfaces using a UNI signalling -manager. -If set to -.Dq Li local , -this host will become an ATMARP server. -The value will be passed as the parameters of an -.Dq Nm atm Cm "set arpserver" Ar netif -command. -.It Va atm_scsparp_ Ns Aq Ar netif -.Pq Vt bool -If set to -.Dq Li YES , -SCSP/ATMARP service for the network interface -.Ar netif -will be initiated using the -.Xr scspd 8 -and -.Xr atmarpd 8 -daemons. -This variable is only applicable if -.Va atm_arpserver_ Ns Aq Ar netif -is set to -.Dq Li local . -.It Va atm_pvcs -.Pq Vt str -Set to the list of ATM PVCs to be added at system -boot time. -For each whitespace separated -.Ar element -in the value, an -.Va atm_pvc_ Ns Aq Ar element -variable is assumed to exist. -The value of each of these variables -will be passed as the parameters of an -.Dq Nm atm Cm "add pvc" -command. -.It Va atm_arps -.Pq Vt str -Set to the list of permanent ATM ARP entries to be added -at system boot time. -For each whitespace separated -.Ar element -in the value, an -.Va atm_arp_ Ns Aq Ar element -variable is assumed to exist. -The value of each of these variables -will be passed as the parameters of an -.Dq Nm atm Cm "add arp" -command. -.It Va natm_interfaces -.Pq Vt str -Set to the list of -.Xr natm 4 -interfaces that will also be used for HARP through -.Xr harp 4 . -If this list is not empty all interfaces in the list will be brought up -with -.Xr ifconfig 8 -and -.Xr harp 4 -will be loaded. -For this to work the interface drivers must be either compiled into the -kernel or must reside on the root partition. .It Va keybell .Pq Vt str The keyboard bell sound. @@ -4592,7 +4449,6 @@ configuration file. .Xr accton 8 , .Xr amd 8 , .Xr apm 8 , -.Xr atm 8 , .Xr bsdinstall 8 , .Xr bthidd 8 , .Xr chkprintcap 8 , diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index e55f0d2a1024..51fb16399ac3 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -293,21 +293,6 @@ see kernel key-management service; see .Xr ipsec 4 -.It Pa netnatm/ -NATM include files; -see -.Xr natm 4 -.Bl -tag -width "kerberos5/" -compact -.It Pa api/ -include files for the signalling API -.It Pa msg/ -include files that describe signalling messages and -declare associated functions -.It Pa saal/ -include files for the signalling AAL layer -.It Pa sig/ -include files for the UNI signalling protocol -.El .It Pa netsmb/ SMB/CIFS requester .It Pa nfs/ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 7e3392b70339..1d8bd7afd133 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -102,13 +102,7 @@ OLD_FILES+=usr/share/man/man8/atrun.8.gz .endif .if ${MK_ATM} == no -OLD_FILES+=etc/rc.d/atm1 -OLD_FILES+=etc/rc.d/atm2 -OLD_FILES+=etc/rc.d/atm3 -OLD_FILES+=rescue/atmconfig -OLD_FILES+=sbin/atmconfig OLD_FILES+=usr/bin/sscop -OLD_FILES+=usr/include/bsnmp/snmp_atm.h OLD_FILES+=usr/include/netnatm/addr.h OLD_FILES+=usr/include/netnatm/api/atmapi.h OLD_FILES+=usr/include/netnatm/api/ccatm.h @@ -136,30 +130,19 @@ OLD_FILES+=usr/lib/libngatm.a OLD_FILES+=usr/lib/libngatm.so OLD_LIBS+=usr/lib/libngatm.so.4 OLD_FILES+=usr/lib/libngatm_p.a -OLD_FILES+=usr/lib/snmp_atm.so -OLD_LIBS+=usr/lib/snmp_atm.so.6 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libngatm.a OLD_FILES+=usr/lib32/libngatm.so OLD_LIBS+=usr/lib32/libngatm.so.4 OLD_FILES+=usr/lib32/libngatm_p.a .endif -OLD_FILES+=usr/share/doc/atm/atmconfig.help -OLD_FILES+=usr/share/doc/atm/atmconfig_device.help -OLD_DIRS+=usr/share/doc/atm OLD_FILES+=usr/share/man/man1/sscop.1.gz OLD_FILES+=usr/share/man/man3/libngatm.3.gz -OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz OLD_FILES+=usr/share/man/man3/uniaddr.3.gz OLD_FILES+=usr/share/man/man3/unifunc.3.gz OLD_FILES+=usr/share/man/man3/unimsg.3.gz OLD_FILES+=usr/share/man/man3/unisap.3.gz OLD_FILES+=usr/share/man/man3/unistruct.3.gz -OLD_FILES+=usr/share/man/man8/atmconfig.8.gz -OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def -OLD_FILES+=usr/share/snmp/defs/atm_tree.def -OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt -OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt .endif .if ${MK_AUDIT} == no @@ -731,7 +714,6 @@ OLD_FILES+=usr/bin/bsnmpwalk OLD_FILES+=usr/include/bsnmp/asn1.h OLD_FILES+=usr/include/bsnmp/bridge_snmp.h OLD_FILES+=usr/include/bsnmp/snmp.h -OLD_FILES+=usr/include/bsnmp/snmp_atm.h OLD_FILES+=usr/include/bsnmp/snmp_mibII.h OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h OLD_FILES+=usr/include/bsnmp/snmpagent.h @@ -745,8 +727,6 @@ OLD_FILES+=usr/lib/libbsnmptools.a OLD_FILES+=usr/lib/libbsnmptools.so OLD_LIBS+=usr/lib/libbsnmptools.so.0 OLD_FILES+=usr/lib/libbsnmptools_p.a -OLD_FILES+=usr/lib/snmp_atm.so -OLD_LIBS+=usr/lib/snmp_atm.so.6 OLD_FILES+=usr/lib/snmp_bridge.so OLD_LIBS+=usr/lib/snmp_bridge.so.6 OLD_FILES+=usr/lib/snmp_hast.so @@ -929,7 +909,6 @@ OLD_FILES+=usr/share/man/man3/reqid_base.3.gz OLD_FILES+=usr/share/man/man3/reqid_istype.3.gz OLD_FILES+=usr/share/man/man3/reqid_next.3.gz OLD_FILES+=usr/share/man/man3/reqid_type.3.gz -OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz @@ -985,8 +964,6 @@ OLD_FILES+=usr/share/man/man3/usm_flush_users.3.gz OLD_FILES+=usr/share/man/man3/usm_next_user.3.gz OLD_FILES+=usr/share/man/man3/usm_new_user.3.gz OLD_FILES+=usr/share/man/man3/usm_user.3.gz -OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def -OLD_FILES+=usr/share/snmp/defs/atm_tree.def OLD_FILES+=usr/share/snmp/defs/bridge_tree.def OLD_FILES+=usr/share/snmp/defs/hast_tree.def OLD_FILES+=usr/share/snmp/defs/hostres_tree.def @@ -9397,7 +9374,6 @@ OLD_FILES+=usr/share/man/man4/usb_quirk.4.gz OLD_FILES+=usr/share/man/man4/usb_template.4.gz OLD_FILES+=usr/share/man/man4/usfs.4.gz OLD_FILES+=usr/share/man/man4/uslcom.4.gz -OLD_FILES+=usr/share/man/man4/utopia.4.gz OLD_FILES+=usr/share/man/man4/uvisor.4.gz OLD_FILES+=usr/share/man/man4/uvscom.4.gz OLD_FILES+=usr/share/man/man4/zyd.4.gz diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 100fa0443bf6..60898fde8772 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1736,8 +1736,6 @@ ktrsockaddr(struct sockaddr *sa) { /* TODO: Support additional address families - #include <netnatm/natm.h> - struct sockaddr_natm *natm; #include <netsmb/netbios.h> struct sockaddr_nb *nb; */ |