On Mon, Dec 10, 2018 at 10:35:23PM +0100, Claudio Jeker wrote:
> Now that fw_cfg support is in vmd it makes sense to have -B disk
> and -B cdrom. Also error out if the option is not known.
>
> This allows to use -B cdrom to force booting from the cdrom disk image
> e.g. to update the VM image.
> --
> :wq Claudio
>
I think you received sufficient oks, but ok mlarkin@ nonetheless.
-ml
> Index: main.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/vmctl/main.c,v
> retrieving revision 1.50
> diff -u -p -r1.50 main.c
> --- main.c 6 Dec 2018 09:23:15 -0000 1.50
> +++ main.c 8 Dec 2018 06:59:17 -0000
> @@ -856,8 +856,14 @@ ctl_start(struct parse_result *res, int
> case 'B':
> if (res->bootdevice)
> errx(1, "boot device specified multiple times");
> - if (strcmp("net", optarg) == 0)
> + if (strcmp("disk", optarg) == 0)
> + res->bootdevice = VMBOOTDEV_DISK;
> + else if (strcmp("cdrom", optarg) == 0)
> + res->bootdevice = VMBOOTDEV_CDROM;
> + else if (strcmp("net", optarg) == 0)
> res->bootdevice = VMBOOTDEV_NET;
> + else
> + errx(1, "unknown boot device %s", optarg);
> break;
> case 'r':
> if (res->isopath)
>
