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

grub-mkconfig: use $pkgdatadir in scripts

Browse source 
Otherwise scripts will source wrong grub-mkconfig_lib.
This commit is contained in:
Andrei Borzenkov 2015-04-29 19:18:54 +03:00
parent 70b002de55
commit 104dff36ea
11 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
util/grub-mkconfig.in
View file

@ -33,6 +33,9 @@ datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE@" pkgdatadir="${datadir}/@PACKAGE@"
fi fi
# export it for scripts
export pkgdatadir
grub_cfg="" grub_cfg=""
grub_mkconfig_dir="${sysconfdir}"/grub.d grub_mkconfig_dir="${sysconfdir}"/grub.d

2
util/grub.d/00_header.in
View file

@ -25,7 +25,7 @@ grub_lang=`echo $LANG | cut -d . -f 1`
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
# Do this as early as possible, since other commands might depend on it. # Do this as early as possible, since other commands might depend on it.
# (e.g. the `loadfont' command might need lvm or raid modules) # (e.g. the `loadfont' command might need lvm or raid modules)

2
util/grub.d/10_hurd.in
View file

@ -24,7 +24,7 @@ datarootdir="@datarootdir@"
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
CLASS="--class gnu --class os" CLASS="--class gnu --class os"

2
util/grub.d/10_illumos.in
View file

@ -20,7 +20,7 @@ set -e
prefix="@prefix@" prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"

2
util/grub.d/10_kfreebsd.in
View file

@ -20,7 +20,7 @@ set -e
prefix="@prefix@" prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"

2
util/grub.d/10_linux.in
View file

@ -21,7 +21,7 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"

2
util/grub.d/10_netbsd.in
View file

@ -20,7 +20,7 @@ set -e
prefix="@prefix@" prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"

2
util/grub.d/10_windows.in
View file

@ -24,7 +24,7 @@ datarootdir="@datarootdir@"
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
case "`uname 2>/dev/null`" in case "`uname 2>/dev/null`" in
CYGWIN*) ;; CYGWIN*) ;;

2
util/grub.d/10_xnu.in
View file

@ -24,7 +24,7 @@ datarootdir="@datarootdir@"
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
osx_entry() { osx_entry() {
if [ x$2 = x32 ]; then if [ x$2 = x32 ]; then

2
util/grub.d/20_linux_xen.in
View file

@ -21,7 +21,7 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"

2
util/grub.d/30_os-prober.in
View file

@ -24,7 +24,7 @@ datarootdir="@datarootdir@"
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
exit 0 exit 0