svn commit: r319032 - in stable: 10/release/tools 11/release/tools

[Glen Barber]

Author: gjb
Date: Sun May 28 03:59:33 2017
New Revision: 319032
URL: https://svnweb.freebsd.org/changeset/base/319032

Log:
  MFC r318872:
   Enable DHCP and IPv6 autoconfig on non-cloud VM images.
  
  PR:		203653
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/tools/vmimage.subr
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/release/tools/vmimage.subr
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/release/tools/vmimage.subr
==============================================================================
--- stable/11/release/tools/vmimage.subr	Sun May 28 03:58:36 2017	(r319031)
+++ stable/11/release/tools/vmimage.subr	Sun May 28 03:59:33 2017	(r319032)
@@ -157,6 +157,11 @@ vm_extra_enable_services() {
 		done
 	fi
 
+	if [ -z "${VMCONFIG}" -o -c "${VMCONFIG}" ]; then
+		echo 'ifconfig_DEFAULT="DHCP inet6 accept_rtadv"' >> \
+			${DESTDIR}/etc/rc.conf
+	fi
+
 	return 0
 }