diff options
| -rw-r--r-- | daemon/grub.c | 9 | ||||
| -rw-r--r-- | generator/generator_actions.ml | 32 |
2 files changed, 35 insertions, 6 deletions
diff --git a/daemon/grub.c b/daemon/grub.c index f394eefe..c61f9df2 100644 --- a/daemon/grub.c +++ b/daemon/grub.c @@ -1,5 +1,5 @@ /* libguestfs - the guestfsd daemon - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009-2011 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,6 +24,13 @@ #include "daemon.h" #include "actions.h" +#include "optgroups.h" + +int +optgroup_grub_available (void) +{ + return prog_exists ("grub-install"); +} int do_grub_install (const char *root, const char *device) diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index bbafcdfb..781142d4 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -2756,7 +2756,7 @@ any partition tables, filesystem superblocks and so on. See also: C<guestfs_zero_device>, C<guestfs_scrub_device>."); - ("grub_install", (RErr, [Pathname "root"; Device "device"], []), 86, [], + ("grub_install", (RErr, [Pathname "root"; Device "device"], []), 86, [Optional "grub"], (* See: * https://bugzilla.redhat.com/show_bug.cgi?id=484986 * https://bugzilla.redhat.com/show_bug.cgi?id=479760 @@ -2766,12 +2766,32 @@ See also: C<guestfs_zero_device>, C<guestfs_scrub_device>."); ["write"; "/boot/grub/device.map"; "(hd0) /dev/vda"]; ["grub_install"; "/"; "/dev/vda"]; ["is_dir"; "/boot"]])], - "install GRUB", + "install GRUB 1", "\ -This command installs GRUB (the Grand Unified Bootloader) on +This command installs GRUB 1 (the Grand Unified Bootloader) on C<device>, with the root directory being C<root>. -Note: If grub-install reports the error +Notes: + +=over 4 + +=item * + +There is currently no way in the API to install grub2, which +is used by most modern Linux guests. It is possible to run +the grub2 command from the guest, although see the +caveats in L<guestfs(3)/RUNNING COMMANDS>. + +=item * + +This uses C<grub-install> from the host. Unfortunately grub is +not always compatible with itself, so this only works in rather +narrow circumstances. Careful testing with each guest version +is advisable. + +=item * + +If grub-install reports the error \"No suitable drive was found in the generated device map.\" it may be that you need to create a C</boot/grub/device.map> file first that contains the mapping between grub device names @@ -2780,7 +2800,9 @@ a file containing: (hd0) /dev/vda -replacing C</dev/vda> with the name of the installation device."); +replacing C</dev/vda> with the name of the installation device. + +=back"); ("cp", (RErr, [Pathname "src"; Pathname "dest"], []), 87, [], [InitScratchFS, Always, TestOutput ( |