On Fri, Oct 24, 2014 at 04:28:14PM -0400, Conrad Meyer wrote:
We still default to bhyveloader(1) if no explicit bootloader
configuration is supplied in the domain.
If the /domain/bootloader looks like grub-bhyve and the user doesn't
supply /domain/bootloader_args, we make an intelligent guess and try
chainloading the first partition on the disk (or a CD if one exists).
Caveat: Assumes the HDD boots from the msdos1 partition. I think this is
a pretty reasonable assumption for a VM. (DrvBhyve with Bhyveload
already assumes that the first disk should be booted.)
I've tested the HDD boot and it seems to work.
Sponsored by: EMC / Isilon storage division
Signed-off-by: Conrad Meyer <conrad.meyer(a)isilon.com>
---
docs/drvbhyve.html.in | 28 ++++++-
docs/formatdomain.html.in | 4 +-
po/libvirt.pot | 4 +
src/bhyve/bhyve_command.c | 204 ++++++++++++++++++++++++++++++++++++++++++----
src/bhyve/bhyve_driver.c | 5 ++
src/bhyve/bhyve_process.c | 5 ++
src/bhyve/bhyve_utils.h | 1 +
7 files changed, 228 insertions(+), 23 deletions(-)
Could you also add to tests/bhyvexml2argv{data/,test.c} so that you
exercise the new code paths in tests.
diff --git a/po/libvirt.pot b/po/libvirt.pot
index 0b44ad7..d8c9a4d 100644
--- a/po/libvirt.pot
+++ b/po/libvirt.pot
@@ -851,6 +851,10 @@ msgstr ""
msgid "domain should have at least one disk defined"
msgstr ""
+#: src/bhyve/bhyve_command.c:407
+msgid "Custom loader requires explicit %s configuration"
+msgstr ""
+
#: src/bhyve/bhyve_device.c:50
msgid "PCI bus 0 slot 1 is reserved for the implicit LPC PCI-ISA bridge"
msgstr ""
You can drop this chunk - we manually update the .pot file before release
and when pushing to our translation system.
Regards,
Daniel
--
|:
http://berrange.com -o-
http://www.flickr.com/photos/dberrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|:
http://entangle-photo.org -o-
http://live.gnome.org/gtk-vnc :|