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

Use @PACKAGE@ instead of hardcoded name when sourcing grub-mkconfig_lib.

Browse source
This commit is contained in:
Grégoire Sutre 2011-07-02 21:22:19 +02:00
parent 548947916b
commit 77546584e1
11 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2011-07-02 Grégoire Sutre <gregoire.sutre@gmail.com>
* util/grub-mkconfig.in: Use @PACKAGE@ instead of hardcoded name when
sourcing grub-mkconfig_lib.
* util/update-grub_lib.in: Likewise.
* util/grub.d/00_header.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/10_netbsd.in: Likewise.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.
2011-06-28 Colin Watson <cjwatson@ubuntu.com> 2011-06-28 Colin Watson <cjwatson@ubuntu.com>
* grub-core/term/gfxterm.c (grub_virtual_screen_setup): Use * grub-core/term/gfxterm.c (grub_virtual_screen_setup): Use

2
util/grub-mkconfig.in
View file

@ -95,7 +95,7 @@ do
esac esac
done done
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/grub-mkconfig_lib
if [ "x$EUID" = "x" ] ; then if [ "x$EUID" = "x" ] ; then
EUID=`id -u` EUID=`id -u`

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

@ -25,7 +25,7 @@ libdir=@libdir@
locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}` locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
grub_lang=`echo $LANG | cut -d . -f 1` grub_lang=`echo $LANG | cut -d . -f 1`
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/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

@ -20,7 +20,7 @@ set -e
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/grub-mkconfig_lib
CLASS="--class gnu --class os" CLASS="--class gnu --class os"

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

@ -21,7 +21,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@ bindir=@bindir@
libdir=@libdir@ libdir=@libdir@
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/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@
bindir=@bindir@ bindir=@bindir@
libdir=@libdir@ libdir=@libdir@
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@ export TEXTDOMAINDIR=@localedir@

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

@ -21,7 +21,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@ bindir=@bindir@
libdir=@libdir@ libdir=@libdir@
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@ export TEXTDOMAINDIR=@localedir@

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

@ -20,7 +20,7 @@ set -e
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/grub-mkconfig_lib
case "`uname 2>/dev/null`" in case "`uname 2>/dev/null`" in
CYGWIN*) ;; CYGWIN*) ;;

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

@ -21,7 +21,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@ bindir=@bindir@
libdir=@libdir@ libdir=@libdir@
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/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

@ -21,7 +21,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/grub-mkconfig_lib
if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
exit 0 exit 0

2
util/update-grub_lib.in
View file

@ -18,6 +18,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/@PACKAGE@/grub-mkconfig_lib
grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead" grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"