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

* util/grub-mkconfig.in (grub_script_check): New variable.

Browse source 
Use grub_script_check instead of grub-script-check.
	Reported by: Barry Jackson.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-11-13 16:00:39 +01:00
parent 7625a68ebb
commit 4417aae6b7
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-11-13 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkconfig.in (grub_script_check): New variable.
Use grub_script_check instead of grub-script-check.
Reported by: Barry Jackson.
2010-11-13 Vladimir Serbinenko <phcoder@gmail.com> 2010-11-13 Vladimir Serbinenko <phcoder@gmail.com>
* docs/grub.texi (menu): Correct the order. * docs/grub.texi (menu): Correct the order.

8
util/grub-mkconfig.in
View file

@ -22,6 +22,7 @@ transform="@program_transform_name@"
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
sbindir=@sbindir@ sbindir=@sbindir@
bindir=@bindir@
libdir=@libdir@ libdir=@libdir@
sysconfdir=@sysconfdir@ sysconfdir=@sysconfdir@
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
@ -35,8 +36,9 @@ grub_mkconfig_dir=${sysconfdir}/grub.d
self=`basename $0` self=`basename $0`
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | "sed ${transform}"`
grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed "${transform}"`
grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
@ -290,7 +292,7 @@ for i in ${grub_mkconfig_dir}/* ; do
done done
if test "x${grub_cfg}" != "x" ; then if test "x${grub_cfg}" != "x" ; then
if ! grub-script-check ${grub_cfg}.new; then if ! ${grub_script_check} ${grub_cfg}.new; then
echo "Syntax errors are detected in generated GRUB config file." >&2 echo "Syntax errors are detected in generated GRUB config file." >&2
echo "Ensure that there are no errors in /etc/default/grub" >&2 echo "Ensure that there are no errors in /etc/default/grub" >&2
echo "and /etc/grub.d/* files or please file a bug report with" >&2 echo "and /etc/grub.d/* files or please file a bug report with" >&2