From: Sascha Wildner <saw@online.de>
Date: Wed, 5 Mar 2014 08:41:11 +0000 (+0100)
Subject: installer: Adjust so we can install a vkernel environment using our ISOs.
X-Git-Tag: v3.9.0~420
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/31c7ac8b59aff7619b6af704d9eb308588b2855f

installer: Adjust so we can install a vkernel environment using our ISOs.

Tested-by: tuxillo
---

diff --git a/usr.sbin/installer/installer/installer.sh b/usr.sbin/installer/installer/installer.sh
index 4ccaeec9d1..51af9aa21c 100644
--- a/usr.sbin/installer/installer/installer.sh
+++ b/usr.sbin/installer/installer/installer.sh
@@ -178,10 +178,14 @@ if [ $# -gt 1 ]; then
 fi
 
 # Check if we are booted from a LiveCD, DVD etc. ttyv1 isn't configured in
-# this case, so use that as a clue for now.
+# this case, so use that as a clue for now. Also, we have to use /dev/console
+# in vkernels.
 #
 _ttyv1=`grep -w "^ttyv1" /etc/ttys`
-if [ -z "$_ttyv1" ]; then
+if [ "`sysctl -n kern.vmm_guest`" = "vkernel" ]; then
+	SOURCE_DIR=/
+	TTY=/dev/console
+elif [ -z "$_ttyv1" ]; then
 	LIVECD=YES
 	SOURCE_DIR=/
 	TTY=/dev/ttyv1