From a3a680af3718e918e7e7104da25e12dda59848df Mon Sep 17 00:00:00 2001
From: =?utf8?q?Imre=20Vad=C3=A1sz?= <imre@vdsz.com>
Date: Sat, 19 Mar 2016 13:21:40 +0100
Subject: [PATCH] sys/boot/efi: RB_MULTIPLE doesn't exist in DragonFly.

---
 sys/boot/efi/loader/bootinfo.c |  6 ++++--
 sys/boot/efi/loader/main.c     | 16 +++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/sys/boot/efi/loader/bootinfo.c b/sys/boot/efi/loader/bootinfo.c
index b15ecd5086..6a03b93d1d 100644
--- a/sys/boot/efi/loader/bootinfo.c
+++ b/sys/boot/efi/loader/bootinfo.c
@@ -55,9 +55,9 @@ int bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp);
 
 extern EFI_SYSTEM_TABLE	*ST;
 
-static const char howto_switches[] = "aCdrgDmphsv";
+static const char howto_switches[] = "aCdrgmphsv";
 static int howto_masks[] = {
-	RB_ASKNAME, RB_CDROM, RB_KDB, RB_DFLTROOT, RB_GDB, RB_MULTIPLE,
+	RB_ASKNAME, RB_CDROM, RB_KDB, RB_DFLTROOT, RB_GDB,
 	RB_MUTE, RB_PAUSE, RB_SERIAL, RB_SINGLE, RB_VERBOSE
 };
 
@@ -81,6 +81,8 @@ bi_getboothowto(char *kargs)
 	if (console != NULL) {
 		if (strcmp(console, "comconsole") == 0)
 			howto |= RB_SERIAL;
+		if (strcmp(console, "vidconsole") == 0)
+			howto |= RB_VIDEO;
 		if (strcmp(console, "nullconsole") == 0)
 			howto |= RB_MUTE;
 	}
diff --git a/sys/boot/efi/loader/main.c b/sys/boot/efi/loader/main.c
index 687ce2ee8d..87b53eb71d 100644
--- a/sys/boot/efi/loader/main.c
+++ b/sys/boot/efi/loader/main.c
@@ -221,9 +221,6 @@ main(int argc, CHAR16 *argv[])
 				case 'd':
 					howto |= RB_KDB;
 					break;
-				case 'D':
-					howto |= RB_MULTIPLE;
-					break;
 				case 'h':
 					howto |= RB_SERIAL;
 					break;
@@ -234,8 +231,10 @@ main(int argc, CHAR16 *argv[])
 					howto |= RB_PAUSE;
 					break;
 				case 'P':
-					if (!has_kbd)
-						howto |= RB_SERIAL | RB_MULTIPLE;
+					if (!has_kbd) {
+						howto &= ~(RB_MUTE|RB_VIDEO);
+						howto |= RB_SERIAL;
+					}
 					break;
 				case 'r':
 					howto |= RB_DFLTROOT;
@@ -285,12 +284,7 @@ main(int argc, CHAR16 *argv[])
 	for (i = 0; howto_names[i].ev != NULL; i++)
 		if (howto & howto_names[i].mask)
 			setenv(howto_names[i].ev, "YES", 1);
-	if (howto & RB_MULTIPLE) {
-		if (howto & RB_SERIAL)
-			setenv("console", "comconsole efi" , 1);
-		else
-			setenv("console", "efi comconsole" , 1);
-	} else if (howto & RB_SERIAL) {
+	if (howto & RB_SERIAL) {
 		setenv("console", "comconsole" , 1);
 	}
 
-- 
2.11.4.GIT