summaryrefslogtreecommitdiff
path: root/usr.sbin/vmctl
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2018-08-23 06:04:54 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2018-08-23 06:04:54 +0000
commit7be3f29de5a77109552fffae7a231475d4551a5e (patch)
tree5ba0fd15f2fb9beabb7348de821589ec4de9b711 /usr.sbin/vmctl
parent379edb23b6137792200867891c0827223ef25fdc (diff)
Allow to boot CDROM-only VMs.
Pointed out by Jon Williams OK mlarkin@ kn@ ccardenas@
Diffstat (limited to 'usr.sbin/vmctl')
-rw-r--r--usr.sbin/vmctl/vmctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/vmctl/vmctl.c b/usr.sbin/vmctl/vmctl.c
index 7ab9a9bc60c..867a0e703e0 100644
--- a/usr.sbin/vmctl/vmctl.c
+++ b/usr.sbin/vmctl/vmctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmctl.c,v 1.54 2018/07/12 12:04:49 reyk Exp $ */
+/* $OpenBSD: vmctl.c,v 1.55 2018/08/23 06:04:53 reyk Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
@@ -98,8 +98,8 @@ vm_start(uint32_t start_id, const char *name, int memsize, int nnics,
errx(1, "too many disks");
else if (ndisks == 0)
warnx("starting without disks");
- if (kernel == NULL && ndisks == 0)
- errx(1, "no kernel or disk specified");
+ if (kernel == NULL && ndisks == 0 && !iso)
+ errx(1, "no kernel or disk/cdrom specified");
if (nnics == -1)
nnics = 0;
if (nnics > VMM_MAX_NICS_PER_VM)