On Thu, Apr 06, 2017 at 08:58:34PM +0000, Pontus Lundkvist wrote:
> Hi,
>
> Version 1.17 of vm.conf.5 changed the keyword "kernel" to "boot", but the
> parser still expects "kernel".
>
> Regards,
> Pontus
You're right, I somehow missed to commit the parse.y bit.
OK?
Reyk
Index: parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/vmd/parse.y,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 parse.y
--- parse.y 27 Mar 2017 00:28:04 -0000 1.23
+++ parse.y 6 Apr 2017 21:10:33 -0000
@@ -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 },
