vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
and not pkgdatadir.
This commit is contained in:
Vladimir Serbinenko 2013-11-25 19:16:05 +01:00
parent 07e3b04742
commit bee1b5ce3f
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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 Colin Watson <cjwatson@ubuntu.com>
2013-11-25 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-25 Vladimir Serbinenko <phcoder@gmail.com>

7
util/grub-mknetdir.c
View file

@ -168,10 +168,11 @@ process_input_dir (const char *input_dir, enum grub_install_plat platform)
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
const char *pkgdatadir = grub_util_get_pkgdatadir (); const char *pkglibdir;
grub_util_host_init (&argc, &argv); grub_util_host_init (&argc, &argv);
rootdir = xstrdup ("/srv/tftp"); rootdir = xstrdup ("/srv/tftp");
pkglibdir = grub_util_get_pkglibdir ();
subdir = grub_util_path_concat (2, GRUB_BOOT_DIR_NAME, GRUB_DIR_NAME); 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++) for (plat = 0; plat < GRUB_INSTALL_PLATFORM_MAX; plat++)
if (targets[plat].mkimage_target) 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_install_get_platform_name (plat));
grub_util_info ("Looking for `%s'", platdir);
if (!grub_util_is_directory (platdir)) if (!grub_util_is_directory (platdir))
{ {
free (platdir); free (platdir);