From 9651475178b1cf9201bd60a158f4b8778475666a Mon Sep 17 00:00:00 2001 From: Michael Hanselmann <hansmi@google.com> Date: Fri, 5 Aug 2011 14:43:05 +0200 Subject: [PATCH] doc/admin: s/grub/GRUB/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit βGRUBβ is an acronym for GRand Unified Bootloader. Signed-off-by: Michael Hanselmann <hansmi@google.com> Reviewed-by: RenΓ© Nussbaumer <rn@google.com> --- doc/admin.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/admin.rst b/doc/admin.rst index 9626ffe2f..645731a94 100644 --- a/doc/admin.rst +++ b/doc/admin.rst @@ -391,16 +391,16 @@ parameters as such: - ``root_path`` to a valid setting (e.g. ``/dev/xvda1``) - ``bootloader_path`` and ``bootloader_args`` to empty -Alternatively, you can delete the kernel management to instances, and +Alternatively, you can delegate the kernel management to instances, and use either ``pvgrub`` or the deprecated ``pygrub``. For this, you must -install the kernels and initrds in the instance, and create a valid grub +install the kernels and initrds in the instance and create a valid GRUB v1 configuration file. For ``pvgrub`` (new in version 2.4.2), you need to set: - ``kernel_path`` to point to the ``pvgrub`` loader present on the node (e.g. ``/usr/lib/xen/boot/pv-grub-x86_32.gz``) -- ``kernel_args`` to the path to the grub config file, relative to the +- ``kernel_args`` to the path to the GRUB config file, relative to the instance (e.g. ``(hd0,0)/grub/menu.lst``) - ``root_path`` **must** be empty - ``bootloader_path`` and ``bootloader_args`` to empty -- GitLab