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

	Use grub_script_check instead of grub-script-check.
	Reported by: Barry Jackson.

diff --git a/ChangeLog b/ChangeLog
index 227be40ce288a1e5ab1707415ee43cbec80d61ac..e6d7b410ad4e83e8e2f1dd8fedab23f2013ba6b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * docs/grub.texi (menu): Correct the order.

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 73f7301312adcc509ce11b27e369a2ef13ffc7d0..2fcc715c286bb6054ba52c96a26728a09b82db26 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -22,6 +22,7 @@ transform="@program_transform_name@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 sbindir=@sbindir@
+bindir=@bindir@
 libdir=@libdir@
 sysconfdir=@sysconfdir@
 PACKAGE_NAME=@PACKAGE_NAME@
@@ -35,8 +36,9 @@ grub_mkconfig_dir=${sysconfdir}/grub.d
 
 self=`basename $0`
 
-grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
-grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
+grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | "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"`
 
@@ -290,7 +292,7 @@ for i in ${grub_mkconfig_dir}/* ; do
 done
 
 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 "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