svn commit: r339604 - stable/12/libexec/rc

[Eugene Grosbein]

Author: eugen
Date: Mon Oct 22 17:27:36 2018
New Revision: 339604
URL: https://svnweb.freebsd.org/changeset/base/339604

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
  Approved by:	re (gjb)

Modified:
  stable/12/libexec/rc/network.subr
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rc/network.subr
==============================================================================
--- stable/12/libexec/rc/network.subr	Mon Oct 22 17:19:48 2018	(r339603)
+++ stable/12/libexec/rc/network.subr	Mon Oct 22 17:27:36 2018	(r339604)
@@ -1393,7 +1393,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# }."