From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 22 Jul 2011 15:17:06 +0000 (+0100)
Subject: docs: Document FEBOOTSTRAP_KERNEL, FEBOOTSTRAP_MODULES (RHBZ#671082).
X-Git-Tag: 1.13.1~6
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=316817b5ad98e294a9d2498a4403e82911a75b4a

docs: Document FEBOOTSTRAP_KERNEL, FEBOOTSTRAP_MODULES (RHBZ#671082).
---

diff --git a/fish/guestfish.pod b/fish/guestfish.pod
index d245672..74d222f 100644
--- a/fish/guestfish.pod
+++ b/fish/guestfish.pod
@@ -1081,6 +1081,16 @@ guestfish returns 0 if the commands completed without error, or
 The C<edit> command uses C<$EDITOR> as the editor.  If not
 set, it uses C<vi>.
 
+=item FEBOOTSTRAP_KERNEL
+
+=item FEBOOTSTRAP_MODULES
+
+These two environment variables allow the kernel that libguestfs uses
+in the appliance to be selected.  If C<$FEBOOTSTRAP_KERNEL> is not
+set, then the most recent host kernel is chosen.  For more information
+about kernel selection, see L<febootstrap-supermin-helper(8)>.  This
+feature is only available in febootstrap E<ge> 3.8.
+
 =item GUESTFISH_DISPLAY_IMAGE
 
 The C<display> command uses C<$GUESTFISH_DISPLAY_IMAGE> to
@@ -1233,7 +1243,8 @@ L<virt-tar-in(1)>,
 L<virt-tar-out(1)>,
 L<virt-win-reg(1)>,
 L<display(1)>,
-L<hexedit(1)>.
+L<hexedit(1)>,
+L<febootstrap-supermin-helper(8)>.
 
 =head1 AUTHORS
 
diff --git a/src/guestfs.pod b/src/guestfs.pod
index 5111033..76570a7 100644
--- a/src/guestfs.pod
+++ b/src/guestfs.pod
@@ -2966,6 +2966,16 @@ be reached in practice.  See the source code for more information.
 
 =over 4
 
+=item FEBOOTSTRAP_KERNEL
+
+=item FEBOOTSTRAP_MODULES
+
+These two environment variables allow the kernel that libguestfs uses
+in the appliance to be selected.  If C<$FEBOOTSTRAP_KERNEL> is not
+set, then the most recent host kernel is chosen.  For more information
+about kernel selection, see L<febootstrap-supermin-helper(8)>.  This
+feature is only available in febootstrap E<ge> 3.8.
+
 =item LIBGUESTFS_APPEND
 
 Pass additional options to the guest kernel.
@@ -3041,6 +3051,7 @@ L<virt-tar-out(1)>,
 L<virt-win-reg(1)>,
 L<qemu(1)>,
 L<febootstrap(1)>,
+L<febootstrap-supermin-helper(8)>,
 L<hivex(3)>,
 L<http://libguestfs.org/>.