Navigation Menu

Skip to content

Commit

Permalink
Remove NATM configuration bits and assorted NATM and ATM remnants.
Browse files Browse the repository at this point in the history
Reported by:	ak
Reviewed by:	ngie (first version)
Differential Revision:	https://reviews.freebsd.org/D10497
  • Loading branch information
brooksdavis committed Apr 25, 2017
1 parent b8b1167 commit 3bfd91b
Show file tree
Hide file tree
Showing 14 changed files with 6 additions and 615 deletions.
4 changes: 4 additions & 0 deletions ObsoleteFiles.inc
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions etc/defaults/rc.conf
Expand Up @@ -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.
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions etc/netstart
Expand Up @@ -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}
Expand Down
7 changes: 0 additions & 7 deletions etc/network.subr
Expand Up @@ -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
;;
Expand Down
8 changes: 0 additions & 8 deletions etc/rc.d/Makefile
Expand Up @@ -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
Expand Down
176 changes: 0 additions & 176 deletions etc/rc.d/atm1

This file was deleted.

97 changes: 0 additions & 97 deletions etc/rc.d/atm2

This file was deleted.

0 comments on commit 3bfd91b

Please sign in to comment.