Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Jul 2020 15:20:24 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r362934 - in stable/11: etc share/man/man5
Message-ID:  <202007041520.064FKOZW056927@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eugen
Date: Sat Jul  4 15:20:23 2020
New Revision: 362934
URL: https://svnweb.freebsd.org/changeset/base/362934

Log:
  MFC r362502,r362503: network.subr, rc.conf: unobsolete gif_interfaces.
  
  There are cases when gif_interfaces cannot be replaced
  with cloned_interfaces, such as tunnels with external IPv6 addresses
  and internal IPv4 or vice versa. Such configuration requires
  extra invocation of ifconfig(8) and supported with gif_interfaces only.

Modified:
  stable/11/etc/network.subr
  stable/11/share/man/man5/rc.conf.5
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/network.subr
==============================================================================
--- stable/11/etc/network.subr	Sat Jul  4 15:16:48 2020	(r362933)
+++ stable/11/etc/network.subr	Sat Jul  4 15:20:23 2020	(r362934)
@@ -1379,9 +1379,6 @@ clone_up()
 			fi
 		esac
 	done
-	if [ -n "$gif_interfaces" ]; then
-		warn "\$gif_interfaces is obsolete.  Use \$cloned_interfaces instead."
-	fi
 	for ifn in ${gif_interfaces}; do
 		# Parse ifn:ifopt.
 		OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS

Modified: stable/11/share/man/man5/rc.conf.5
==============================================================================
--- stable/11/share/man/man5/rc.conf.5	Sat Jul  4 15:16:48 2020	(r362933)
+++ stable/11/share/man/man5/rc.conf.5	Sat Jul  4 15:20:23 2020	(r362934)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 8, 2020
+.Dd June 23, 2020
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -1842,46 +1842,35 @@ Even if this variable is specified to
 .Dq :nosticky
 keyword can be used to override it on per interface basis.
 .It Va gif_interfaces
-.Pq Vt str
-This variable is deprecated in favor of
-.Va cloned_interfaces .
 Set to the list of
 .Xr gif 4
 tunnel interfaces to configure on this host.
-For each
-.Xr gif
-tunnel interface, set a variable named
-.Va ifconfig_ Ns Aq Ar interface
-with the parameters for the
-.Xr ifconfig 8
-command to configure the link level for
-.Ar interface
-with the
-.Cm tunnel
-option.
+A
+.Va gifconfig_ Ns Aq Ar interface
+variable is assumed to exist for each value of
+.Ar interface .
 The value of this variable is used to configure the link layer of the
 tunnel using the
 .Cm tunnel
 option to
 .Xr ifconfig .
+Additionally, this option ensures that each listed interface is created
+via the
+.Cm create
+option to
+.Xr ifconfig
+before attempting to configure it.
+.Pp
 For example, configure two
 .Xr gif
 interfaces with:
-.Bd -literal -offset indent
+.Bd -literal
 gif_interfaces="gif0 gif1"
-ifconfig_gif0="tunnel src_addr0 dst_addr0"
-ifconfig_gif1="tunnel src_addr1 dst_addr1"
+gifconfig_gif0="100.64.0.1 100.64.0.2"
+ifconfig_gif0="inet 10.0.0.1 10.0.0.2 netmask 255.255.255.252"
+gifconfig_gif1="inet6 2a00::1 2a01::1"
+ifconfig_gif1="inet 10.1.0.1 10.1.0.2 netmask 255.255.255.252"
 .Ed
-.Pp
-Additionally, this option ensures that each listed interface is created
-via the
-.Cm create
-option to
-.Xr ifconfig .
-This example also works with
-.Va cloned_interfaces
-instead of
-.Va gif_interfaces .
 .It Va sppp_interfaces
 .Pq Vt str
 Set to the list of



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007041520.064FKOZW056927>