aboutsummaryrefslogtreecommitdiffstats
path: root/docs/misc
diff options
context:
space:
mode:
authorMatt Wilson <msw@amazon.com>2012-07-24 17:02:04 +0200
committerMatt Wilson <msw@amazon.com>2012-07-24 17:02:04 +0200
commit9e0de31c672fd127e6fb0c88a26eb147037a9abc (patch)
tree147961dad1a4328d54ad2ca37bd2059adcf21f86 /docs/misc
parentf2c89c53c44d9d8adbba43db6f02701c8b155383 (diff)
downloadxen-9e0de31c672fd127e6fb0c88a26eb147037a9abc.tar.gz
xen-9e0de31c672fd127e6fb0c88a26eb147037a9abc.tar.bz2
xen-9e0de31c672fd127e6fb0c88a26eb147037a9abc.zip
x86/EFI: define and use EFI_DIR make variable, defaulting to /usr/lib64/efi
After commit 25594:ad08cd8e7097, EFI Xen binaries were installed to /efi instead of /usr/lib64/efi. This patch restores the previous behaviour established in commit 23645:638f31a30b6c. Signed-off-by: Matt Wilson <msw@amazon.com> Reported-by: Olaf Hering <olaf@aepfle.de> Committed-by: Jan Beulich <jbeulich@suse.com>
Diffstat (limited to 'docs/misc')
-rw-r--r--docs/misc/efi.markdown6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/misc/efi.markdown b/docs/misc/efi.markdown
index 652ea4d1ff..d697bc23c8 100644
--- a/docs/misc/efi.markdown
+++ b/docs/misc/efi.markdown
@@ -4,10 +4,12 @@ newer. Additionally, the binutils build must be configured to include support
for the x86_64-pep emulation (i.e. `--enable-targets=x86_64-pep` or an option
of equivalent effect should be passed to the configure script).
-Once built, `make install-xen` can place the resulting binary directly into
+Once built, `make install-xen` will place the resulting binary directly into
the EFI boot partition, provided `EFI_VENDOR` is set in the environment (and
`EFI_MOUNTPOINT` is overridden as needed, should the default of `/boot/efi` not
-match your system).
+match your system). The xen.efi binary will also be installed in
+`/usr/lib64/efi/`, unless `EFI_DIR` is set in the environment to override this
+default.
The binary itself will require a configuration file (names with the `.efi`
extension of the binary's name replaced by `.cfg`, and - until an existing