From bee1b5ce3fea2dc03f8ae6371d03e833f6583a57 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 25 Nov 2013 19:16:05 +0100 Subject: [PATCH] * util/grub-mknetdir.c: Look for platform directories under pkglibdir and not pkgdatadir. --- ChangeLog | 5 +++++ util/grub-mknetdir.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38f8159c8..ca1710e72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-25 Vladimir Serbinenko + + * util/grub-mknetdir.c: Look for platform directories under pkglibdir + and not pkgdatadir. + 2013-11-25 Colin Watson 2013-11-25 Vladimir Serbinenko diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c index 20130d3cf..3f9170597 100644 --- a/util/grub-mknetdir.c +++ b/util/grub-mknetdir.c @@ -168,10 +168,11 @@ process_input_dir (const char *input_dir, enum grub_install_plat platform) int main (int argc, char *argv[]) { - const char *pkgdatadir = grub_util_get_pkgdatadir (); + const char *pkglibdir; grub_util_host_init (&argc, &argv); rootdir = xstrdup ("/srv/tftp"); + pkglibdir = grub_util_get_pkglibdir (); subdir = grub_util_path_concat (2, GRUB_BOOT_DIR_NAME, GRUB_DIR_NAME); @@ -191,9 +192,11 @@ main (int argc, char *argv[]) for (plat = 0; plat < GRUB_INSTALL_PLATFORM_MAX; plat++) if (targets[plat].mkimage_target) { - char *platdir = grub_util_path_concat (2, pkgdatadir, + char *platdir = grub_util_path_concat (2, pkglibdir, grub_install_get_platform_name (plat)); + grub_util_info ("Looking for `%s'", platdir); + if (!grub_util_is_directory (platdir)) { free (platdir);