* util/grub-mkrescue.c (main): If a source directory is not

specified, read platform-specific files from subdirectories of
pkglibdir, not pkgdatadir.
This commit is contained in:
Colin Watson committed 2013-11-21 17:36:45 +00:00
1 parent b7f9aedfac
commit c6a823e267
2 files changed
+8 -1

No files matched your search

+6
View File
@@ -1,3 +1,9 @@
2013-11-21 Colin Watson <cjwatson@ubuntu.com>
* 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 <cjwatson@ubuntu.com> 2013-11-21 Colin Watson <cjwatson@ubuntu.com>
* grub-core/normal/progress.c: Remove unused file. * grub-core/normal/progress.c: Remove unused file.
+2 -1
View File
@@ -396,11 +396,12 @@ main (int argc, char *argv[])
if (!grub_install_source_directory) if (!grub_install_source_directory)
{ {
const char *pkglibdir = grub_util_get_pkglibdir ();
enum grub_install_plat plat; enum grub_install_plat plat;
for (plat = 0; plat < GRUB_INSTALL_PLATFORM_MAX; 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)); grub_install_get_platform_name (plat));
if (!grub_util_is_directory (platdir)) if (!grub_util_is_directory (platdir))