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

* util/grub-mkconfig_lib.in: Keep supplied pkgdatadir if any.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-09-18 20:26:16 +02:00
parent 1bc783bd39
commit 5307078763
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -3,6 +3,10 @@
* docs/grub.texi (Networking commands): Add documentation for * docs/grub.texi (Networking commands): Add documentation for
network related commands. network related commands.
2013-09-18 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkconfig_lib.in: Keep supplied pkgdatadir if any.
2013-09-18 Vladimir Serbinenko <phcoder@gmail.com> 2013-09-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/mm.c (grub_mm_init_region): Skip regions less than * grub-core/kern/mm.c (grub_mm_init_region): Skip regions less than

4
util/grub-mkconfig_lib.in
View file

@ -20,7 +20,9 @@ datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
bindir="@bindir@" bindir="@bindir@"
sbindir="@sbindir@" sbindir="@sbindir@"
pkgdatadir="${datadir}/@PACKAGE@" if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE@"
fi
if test "x$grub_probe" = x; then if test "x$grub_probe" = x; then
grub_probe="${sbindir}/@grub_probe@" grub_probe="${sbindir}/@grub_probe@"