* util/grub-mknetdir.c: Look for platform directories under pkglibdir

	and not pkgdatadir.

diff --git a/ChangeLog b/ChangeLog
index 38f8159c8450298457217e8fcc27576f631935b8..ca1710e7201ba942238eccfac16c2b63345b3d7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mknetdir.c: Look for platform directories under pkglibdir
+       and not pkgdatadir.
+
 2013-11-25  Colin Watson  <cjwatson@ubuntu.com>
 2013-11-25  Vladimir Serbinenko  <phcoder@gmail.com>
 

diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
index 20130d3cfb6bb9dc76fe0a0d0d077428af3c4d32..3f9170597aac6090134fd8f9cb83d41ac1a024a1 100644 (file)
--- 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);