Author: brooks
Date: Tue May 21 16:36:28 2019
New Revision: 348055
URL: https://svnweb.freebsd.org/changeset/base/348055
Log:
Revert r348012, MFC r347963.
Several of the changes touch actual defaults. These defaults are all
mistakes and no one should rely on them, but changing them in a stable
branch is clearly inappropriate.
Reported by: rgrimes
Modified:
stable/12/libexec/rc/rc.conf
stable/12/sbin/ifconfig/ifconfig.8
stable/12/share/man/man5/rc.conf.5
stable/12/tools/tools/tinybsd/conf/firewall/etc/rc.firewall
stable/12/usr.sbin/jail/jail.8
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/libexec/rc/rc.conf
==============================================================================
--- stable/12/libexec/rc/rc.conf Tue May 21 15:59:17 2019
(r348054)
+++ stable/12/libexec/rc/rc.conf Tue May 21 16:36:28 2019
(r348055)
@@ -121,9 +121,9 @@ hostid_file="/etc/hostid" # File with hostuuid.
nisdomainname="NO" # Set to NIS domain if using NIS (or NO).
dhclient_program="/sbin/dhclient" # Path to dhcp client program.
dhclient_flags="" # Extra flags to pass to dhcp client.
-#dhclient_flags_em0="" # Extra dhclient flags for em0 only
+#dhclient_flags_fxp0="" # Extra dhclient flags for fxp0 only
background_dhclient="NO" # Start dhcp client in the background.
-#background_dhclient_em0="YES" # Start dhcp client on em0 in the background.
+#background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the
background.
synchronous_dhclient="NO" # Start dhclient directly on configured
# interfaces during startup.
defaultroute_delay="30" # Time to wait for a default route on a
DHCP interface.
@@ -147,19 +147,19 @@ firewall_client_net="192.0.2.0/24" # IPv4 Network addr
# firewall.
#firewall_client_net_ipv6="2001:db8:2:1::/64" # IPv6 network prefix for
# "client" firewall.
-firewall_simple_iif="em1" # Inside network interface for "simple"
+firewall_simple_iif="ed1" # Inside network interface for "simple"
# firewall.
firewall_simple_inet="192.0.2.16/28" # Inside network address for "simple"
# firewall.
-firewall_simple_oif="em0" # Outside network interface for "simple"
+firewall_simple_oif="ed0" # Outside network interface for "simple"
# firewall.
firewall_simple_onet="192.0.2.0/28" # Outside network address for "simple"
# firewall.
-#firewall_simple_iif_ipv6="em1" # Inside IPv6 network interface for
"simple"
+#firewall_simple_iif_ipv6="ed1" # Inside IPv6 network interface for
"simple"
# firewall.
#firewall_simple_inet_ipv6="2001:db8:2:800::/56" # Inside IPv6 network prefix
# for "simple" firewall.
-#firewall_simple_oif_ipv6="em0" # Outside IPv6 network interface for
"simple"
+#firewall_simple_oif_ipv6="ed0" # Outside IPv6 network interface for
"simple"
# firewall.
#firewall_simple_onet_ipv6="2001:db8:2:0::/56" # Outside IPv6 network prefix
# for "simple" firewall.
@@ -241,14 +241,14 @@ cloned_interfaces="" # List of cloned
network interfa
#cloned_interfaces="gif0 gif1 gif2 gif3" # Pre-cloning GENERIC config.
#ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration.
#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias
entry.
-#ifconfig_em0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry
-#ifconfig_em0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias
-#ifconfig_em0_name="net0" # Change interface name from em0 to net0.
-#vlans_em0="101 vlan0" # vlan(4) interfaces for em0 device
+#ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry
+#ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias
+#ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0.
+#vlans_fxp0="101 vlan0" # vlan(4) interfaces for fxp0 device
#create_args_vlan0="vlan 102" # vlan tag for vlan0 device
#wlans_ath0="wlan0" # wlan(4) interfaces for ath0 device
#wlandebug_wlan0="scan+auth+assoc" # Set debug flags with wlandebug(8)
-#ipv4_addrs_em0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry.
+#ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address
entry.
#
#autobridge_interfaces="bridge0" # List of bridges to check
#autobridge_bridge0="tap* vlan0" # Interface glob to automatically add
to the bridge
@@ -336,7 +336,7 @@ bootparamd_flags="" # Flags to bootparamd
pppoed_enable="NO" # Run the PPP over Ethernet daemon.
pppoed_provider="*" # Provider and ppp(8) config file entry.
pppoed_flags="-P /var/run/pppoed.pid" # Flags to pppoed (if enabled).
-pppoed_interface="em0" # The interface that pppoed runs on.
+pppoed_interface="fxp0" # The interface that pppoed runs on.
sshd_enable="NO" # Enable sshd
sshd_program="/usr/sbin/sshd" # path to sshd, if you want a different one.
sshd_flags="" # Additional flags for sshd.
@@ -506,11 +506,11 @@ route6d_flags="" # Flags to IPv6 routing daemon.
# addrs.
#route6d_flags="-q" # If you want to run a routing daemon on an end
# node, you should stop advertisement.
-#ipv6_network_interfaces="em0 em1" # Examples for router
+#ipv6_network_interfaces="ed0 ep0" # Examples for router
# or static configuration for end node.
# Choose correct prefix value.
-#ipv6_prefix_em0="fec0:0000:0000:0001 fec0:0000:0000:0002" # Examples for rtr.
-#ipv6_prefix_em1="fec0:0000:0000:0003 fec0:0000:0000:0004" # Examples for rtr.
+#ipv6_prefix_ed0="fec0:0000:0000:0001 fec0:0000:0000:0002" # Examples for rtr.
+#ipv6_prefix_ep0="fec0:0000:0000:0003 fec0:0000:0000:0004" # Examples for rtr.
ipv6_default_interface="NO" # Default output interface for scoped addrs.
# This works only with
# ipv6_gateway_enable="NO".
Modified: stable/12/sbin/ifconfig/ifconfig.8
==============================================================================
--- stable/12/sbin/ifconfig/ifconfig.8 Tue May 21 15:59:17 2019
(r348054)
+++ stable/12/sbin/ifconfig/ifconfig.8 Tue May 21 16:36:28 2019
(r348055)
@@ -28,7 +28,7 @@
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
.\" $FreeBSD$
.\"
-.Dd May 18, 2019
+.Dd May 3, 2019
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -196,7 +196,7 @@ This
parameter is a string of the form
.Dq name unit ,
for example,
-.Dq Li em0 .
+.Dq Li ed0 .
.It Ar groupname
List the interfaces in the given group.
.El
@@ -2919,26 +2919,26 @@ Assign the IPv4 address
with a network mask of
.Li 255.255.255.0 ,
to the interface
-.Li em0 :
-.Dl # ifconfig em0 inet 192.0.2.10 netmask 255.255.255.0
+.Li fxp0 :
+.Dl # ifconfig fxp0 inet 192.0.2.10 netmask 255.255.255.0
.Pp
Add the IPv4 address
.Li 192.0.2.45 ,
with the CIDR network prefix
.Li /28 ,
to the interface
-.Li em0 ,
+.Li ed0 ,
using
.Cm add
as a synonym for the canonical form of the option
.Cm alias :
-.Dl # ifconfig em0 inet 192.0.2.45/28 add
+.Dl # ifconfig ed0 inet 192.0.2.45/28 add
.Pp
Remove the IPv4 address
.Li 192.0.2.45
from the interface
-.Li em0 :
-.Dl # ifconfig em0 inet 192.0.2.45 -alias
+.Li ed0 :
+.Dl # ifconfig ed0 inet 192.0.2.45 -alias
.Pp
Enable IPv6 functionality of the interface:
.Dl # ifconfig em0 inet6 -ifdisabled
Modified: stable/12/share/man/man5/rc.conf.5
==============================================================================
--- stable/12/share/man/man5/rc.conf.5 Tue May 21 15:59:17 2019
(r348054)
+++ stable/12/share/man/man5/rc.conf.5 Tue May 21 16:36:28 2019
(r348055)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 18, 2019
+.Dd March 21, 2019
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -1262,11 +1262,11 @@ It is possible to add IP alias entries using
syntax with the address family keyword such as
.Li inet .
Assuming that the interface in question was
-.Li em0 ,
+.Li ed0 ,
it might look something like this:
.Bd -literal
-ifconfig_em0_alias0="inet 127.0.0.253 netmask 0xffffffff"
-ifconfig_em0_alias1="inet 127.0.0.254 netmask 0xffffffff"
+ifconfig_ed0_alias0="inet 127.0.0.253 netmask 0xffffffff"
+ifconfig_ed0_alias1="inet 127.0.0.254 netmask 0xffffffff"
.Ed
.Pp
It also possible to configure multiple IP addresses in Classless
@@ -1306,11 +1306,11 @@ not for the other address families such as
.Li inet6 .
.Pp
With the interface in question being
-.Li em0 ,
+.Li ed0 ,
an example could look like:
.Bd -literal
-ifconfig_em0_alias2="inet 192.0.2.129/27"
-ifconfig_em0_alias3="inet 192.0.2.1-5/28"
+ifconfig_ed0_alias2="inet 192.0.2.129/27"
+ifconfig_ed0_alias3="inet 192.0.2.1-5/28"
.Ed
.Pp
and so on.
@@ -1332,10 +1332,10 @@ its contents are passed to
Execution stops at the first unsuccessful access, so if
something like this is present:
.Bd -literal
-ifconfig_em0_alias0="inet 127.0.0.251 netmask 0xffffffff"
-ifconfig_em0_alias1="inet 127.0.0.252 netmask 0xffffffff"
-ifconfig_em0_alias2="inet 127.0.0.253 netmask 0xffffffff"
-ifconfig_em0_alias4="inet 127.0.0.254 netmask 0xffffffff"
+ifconfig_ed0_alias0="inet 127.0.0.251 netmask 0xffffffff"
+ifconfig_ed0_alias1="inet 127.0.0.252 netmask 0xffffffff"
+ifconfig_ed0_alias2="inet 127.0.0.253 netmask 0xffffffff"
+ifconfig_ed0_alias4="inet 127.0.0.254 netmask 0xffffffff"
.Ed
.Pp
Then note that alias4 would
@@ -1351,7 +1351,7 @@ variable, which has the same functionality as
.Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n
and can have all of entries in a variable like the following:
.Bd -literal
-ifconfig_em0_aliases="\\
+ifconfig_ed0_aliases="\\
inet 127.0.0.251 netmask 0xffffffff \\
inet 127.0.0.252 netmask 0xffffffff \\
inet 127.0.0.253 netmask 0xffffffff \\
@@ -1458,11 +1458,11 @@ to the
.Va ifconfig_ Ns Aq Ar interface
variable.
For instance, to initialize the
-.Li em0
+.Li ed0
device via DHCP,
it is possible to use something like:
.Bd -literal
-ifconfig_em0="DHCP"
+ifconfig_ed0="DHCP"
.Ed
.Pp
If you want to configure your wireless interface with
@@ -1513,7 +1513,7 @@ variable.
.Pp
It is also possible to rename an interface by doing:
.Bd -literal
-ifconfig_em0_name="net0"
+ifconfig_ed0_name="net0"
ifconfig_net0="inet 192.0.2.1 netmask 0xffffff00"
.Ed
.It Va ipv6_enable
@@ -1686,8 +1686,8 @@ with
keyword.
For example:
.Bd -literal
-ifconfig_em0_ipv6="inet6 2001:db8:1::1 prefixlen 64"
-ifconfig_em0_alias0="inet6 2001:db8:2::1 prefixlen 64"
+ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64"
+ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64"
.Ed
.Pp
Interfaces that have an
@@ -1714,7 +1714,7 @@ defined in
If only a link-local address is needed on the interface,
the following configuration can be used:
.Bd -literal
-ifconfig_em0_ipv6="inet6 auto_linklocal"
+ifconfig_ed0_ipv6="inet6 auto_linklocal"
.Ed
.Pp
A link-local address can also be configured manually.
@@ -1723,7 +1723,7 @@ so that it does not change when the network interface
card is replaced.
For example:
.Bd -literal
-ifconfig_em0_ipv6="inet6 fe80::1 prefixlen 64"
+ifconfig_ed0_ipv6="inet6 fe80::1 prefixlen 64"
.Ed
.It Va ipv6_prefix_ Ns Aq Ar interface
.Pq Vt str
@@ -1737,15 +1737,15 @@ is empty.
.Pp
For example, the following configuration
.Bd -literal
-ipv6_prefix_em0="2001:db8:1:0 2001:db8:2:0"
+ipv6_prefix_ed0="2001:db8:1:0 2001:db8:2:0"
.Ed
.Pp
is equivalent to the following:
.Bd -literal
-ifconfig_em0_alias0="inet6 2001:db8:1:: eui64 prefixlen 64"
-ifconfig_em0_alias1="inet6 2001:db8:1:: prefixlen 64 anycast"
-ifconfig_em0_alias2="inet6 2001:db8:2:: eui64 prefixlen 64"
-ifconfig_em0_alias3="inet6 2001:db8:2:: prefixlen 64 anycast"
+ifconfig_ed0_alias0="inet6 2001:db8:1:: eui64 prefixlen 64"
+ifconfig_ed0_alias1="inet6 2001:db8:1:: prefixlen 64 anycast"
+ifconfig_ed0_alias2="inet6 2001:db8:2:: eui64 prefixlen 64"
+ifconfig_ed0_alias3="inet6 2001:db8:2:: prefixlen 64 anycast"
.Ed
.Pp
These Subnet-Router anycast addresses will be added only when
Modified: stable/12/tools/tools/tinybsd/conf/firewall/etc/rc.firewall
==============================================================================
--- stable/12/tools/tools/tinybsd/conf/firewall/etc/rc.firewall Tue May 21
15:59:17 2019 (r348054)
+++ stable/12/tools/tools/tinybsd/conf/firewall/etc/rc.firewall Tue May 21
16:36:28 2019 (r348055)
@@ -195,13 +195,13 @@ case ${firewall_type} in
############
# set these to your outside interface network and netmask and ip
- oif="em0"
+ oif="ed0"
onet="192.0.2.0"
omask="255.255.255.240"
oip="192.0.2.1"
# set these to your inside interface network and netmask and ip
- iif="em1"
+ iif="ed1"
inet="192.0.2.16"
imask="255.255.255.240"
iip="192.0.2.17"
Modified: stable/12/usr.sbin/jail/jail.8
==============================================================================
--- stable/12/usr.sbin/jail/jail.8 Tue May 21 15:59:17 2019
(r348054)
+++ stable/12/usr.sbin/jail/jail.8 Tue May 21 16:36:28 2019
(r348055)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 18, 2019
+.Dd November 27, 2018
.Dt JAIL 8
.Os
.Sh NAME
@@ -1099,7 +1099,7 @@ testjail {
mount.devfs;
host.hostname = testhostname;
ip4.addr = 192.0.2.100;
- interface = em0;
+ interface = ed0;
exec.start = "/bin/sh /etc/rc";
exec.stop = "/bin/sh /etc/rc.shutdown";
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
