svn commit: r339680 - stable/10/etc

[Eugene Grosbein]

Author: eugen
Date: Wed Oct 24 05:15:46 2018
New Revision: 339680
URL: https://svnweb.freebsd.org/changeset/base/339680

Log:
  MFC r339462: make upgrade from previous FreeBSD versions less painful
  and make previously working configuration like this work again:
  
  gif_interfaces="gif0"
  gifconfig_gif0="1.1.1.1 2.2.2.2"
  ifconfig_gif0="inet 192.168.1.1 192.168.1.2 netmask 255.255.255.252"
  
  PR:		204700

Modified:
  stable/10/etc/network.subr
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/network.subr
==============================================================================
--- stable/10/etc/network.subr	Wed Oct 24 05:14:02 2018	(r339679)
+++ stable/10/etc/network.subr	Wed Oct 24 05:15:46 2018	(r339680)
@@ -1335,7 +1335,7 @@ clone_up()
 			_list="$_list $ifn"
 		fi
 		tmpargs=$(get_if_var $ifn gifconfig_IF)
-		eval ifconfig_${ifn}=\"tunnel \$tmpargs\"
+		eval ifconfig_${ifn}=\"\$ifconfig_${ifn} tunnel \$tmpargs\"
 	done
 	if [ -n "${_list# }" ]; then
 		echo "Created clone interfaces: ${_list# }."