From 6b03ca832af8774eea914a99e4e49c232b169cd4 Mon Sep 17 00:00:00 2001
From: reyk <reyk@openbsd.org>
Date: Thu, 6 Apr 2017 21:35:22 +0000
Subject: [PATCH] "kernel" got renamed to "boot" in vm.conf but I didn't commit
 the parse.y bits.

Found by Pontus Lundkvist

OK deraadt
---
 usr.sbin/vmd/parse.y | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/vmd/parse.y b/usr.sbin/vmd/parse.y
index d89cb3e0012..935e13b4106 100644
--- a/usr.sbin/vmd/parse.y
+++ b/usr.sbin/vmd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.23 2017/03/27 00:28:04 deraadt Exp $	*/
+/*	$OpenBSD: parse.y,v 1.24 2017/04/06 21:35:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007-2016 Reyk Floeter <reyk@openbsd.org>
@@ -116,7 +116,7 @@ typedef struct {
 
 %token	INCLUDE ERROR
 %token	ADD DISK DOWN GROUP INTERFACE NIFS PATH SIZE SWITCH UP VMID
-%token	ENABLE DISABLE VM KERNEL LLADDR MEMORY OWNER LOCKED
+%token	ENABLE DISABLE VM BOOT LLADDR MEMORY OWNER LOCKED
 %token	<v.string>	STRING
 %token  <v.number>	NUMBER
 %type	<v.number>	disable
@@ -357,7 +357,7 @@ vm_opts		: disable			{
 			free($2);
 			vmc.vmc_flags |= VMOP_CREATE_NETWORK;
 		}
-		| KERNEL string			{
+		| BOOT string			{
 			if (vcp->vcp_kernel[0] != '\0') {
 				yyerror("kernel specified more than once");
 				free($2);
@@ -605,6 +605,7 @@ lookup(char *s)
 	/* this has to be sorted always */
 	static const struct keywords keywords[] = {
 		{ "add",		ADD },
+		{ "boot",		BOOT },
 		{ "disable",		DISABLE },
 		{ "disk",		DISK },
 		{ "down",		DOWN },
@@ -614,7 +615,6 @@ lookup(char *s)
 		{ "include",		INCLUDE },
 		{ "interface",		INTERFACE },
 		{ "interfaces",		NIFS },
-		{ "kernel",		KERNEL },
 		{ "lladdr",		LLADDR },
 		{ "locked",		LOCKED },
 		{ "memory",		MEMORY },
-- 
2.20.1