diff options
| author |   claudio <claudio@openbsd.org> | 2018-12-06 09:20:06 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2018-12-06 09:20:06 +0000 |
| commit | cc104512f4ca187c1264927a66c05bf5497f2c60 (patch) | |
| tree | 1777a079892cf354b153c32fcc373c1daa85d52b /usr.sbin/vmd/vm.c | |
| parent | When building ND packets use m_align() to pack the mbuf as optimal as (diff) | |
| download | wireguard-openbsd-cc104512f4ca187c1264927a66c05bf5497f2c60.tar.xz wireguard-openbsd-cc104512f4ca187c1264927a66c05bf5497f2c60.zip | |
Make it possible to define the bootdevice in vmd. This information is used
currently only when booting a OpenBSD kernel. If VMBOOTDEV_NET is used the
internal dhcp server will pass "auto_install" as boot file to the client and
the boot loader passes the MAC of the first interface to the kernel to indicate
PXE booting. Adding boot order support to SeaBIOS is not yet implemented.
Ok ccardenas@
Diffstat (limited to 'usr.sbin/vmd/vm.c')
| -rw-r--r-- | usr.sbin/vmd/vm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c index d4f3a2eb710..e9e5e073ae2 100644 --- a/usr.sbin/vmd/vm.c +++ b/usr.sbin/vmd/vm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm.c,v 1.41 2018/10/08 16:32:01 reyk Exp $ */ +/* $OpenBSD: vm.c,v 1.42 2018/12/06 09:20:06 claudio Exp $ */ /* * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org> @@ -335,7 +335,7 @@ start_vm(struct vmd_vm *vm, int fd) /* Load kernel image */ ret = loadfile_elf(fp, vcp, &vrs, - vmboot.vbp_bootdev, vmboot.vbp_howto); + vmboot.vbp_bootdev, vmboot.vbp_howto, vmc->vmc_bootdevice); /* * Try BIOS as a fallback (only if it was provided as an image |