From c6a823e26716c135e5e3f0b5c3637fa1fb04a39e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 21 Nov 2013 17:36:45 +0000 Subject: [PATCH] * util/grub-mkrescue.c (main): If a source directory is not specified, read platform-specific files from subdirectories of pkglibdir, not pkgdatadir. --- ChangeLog | 6 ++++++ util/grub-mkrescue.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fb8347f5e..6d4b5b210 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-11-21 Colin Watson + + * util/grub-mkrescue.c (main): If a source directory is not + specified, read platform-specific files from subdirectories of + pkglibdir, not pkgdatadir. + 2013-11-21 Colin Watson * grub-core/normal/progress.c: Remove unused file. diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c index 6b7239846..7a76bc37a 100644 --- a/util/grub-mkrescue.c +++ b/util/grub-mkrescue.c @@ -396,11 +396,12 @@ main (int argc, char *argv[]) if (!grub_install_source_directory) { + const char *pkglibdir = grub_util_get_pkglibdir (); enum grub_install_plat plat; for (plat = 0; plat < GRUB_INSTALL_PLATFORM_MAX; plat++) { - char *platdir = grub_util_path_concat (2, pkgdatadir, + char *platdir = grub_util_path_concat (2, pkglibdir, grub_install_get_platform_name (plat)); if (!grub_util_is_directory (platdir))