From owner-svn-src-projects@FreeBSD.ORG  Wed Jan 14 15:23:59 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 28D9B82F;
 Wed, 14 Jan 2015 15:23:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 11305F39;
 Wed, 14 Jan 2015 15:23:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0EFNwJN046409;
 Wed, 14 Jan 2015 15:23:58 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0EFNwF1046408;
 Wed, 14 Jan 2015 15:23:58 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201501141523.t0EFNwF1046408@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 14 Jan 2015 15:23:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r277183 - projects/release-vmimage/release/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jan 2015 15:23:59 -0000

Author: gjb
Date: Wed Jan 14 15:23:58 2015
New Revision: 277183
URL: https://svnweb.freebsd.org/changeset/base/277183

Log:
  Enable the textmode console by default for VM images,
  since there is no way to tell if the environment will
  be able to use the graphics-mode console.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/tools/vmimage.subr

Modified: projects/release-vmimage/release/tools/vmimage.subr
==============================================================================
--- projects/release-vmimage/release/tools/vmimage.subr	Wed Jan 14 14:50:31 2015	(r277182)
+++ projects/release-vmimage/release/tools/vmimage.subr	Wed Jan 14 15:23:58 2015	(r277183)
@@ -84,6 +84,12 @@ vm_install_base() {
 			>> ${DESTDIR}/etc/fstab
 	fi
 
+	# Set hw.vga.textmode=1, with the assumption that the hypervisor
+	# will not be capable of using the graphics console mode. 
+	echo '# Comment the next line to enable graphical console mode' \
+		>> ${DESTDIR}/boot/loader.conf
+	echo 'hw.vga.textmode=1' >> ${DESTDIR}/boot/loader.conf
+
 	mkdir -p ${DESTDIR}/dev
 	mount -t devfs devfs ${DESTDIR}/dev
 	chroot ${DESTDIR} /usr/bin/newaliases