2009-10-06 Colin Watson <cjwatson@ubuntu.com>

	* util/i386/pc/grub-install.in: Source
	${libdir}/grub/grub-mkconfig_lib before option processing, in order
	that the --grub-probe option will work.
	* util/sparc64/ieee1275/grub-install.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index e2724685694228ff62d9718efb8bb54233a90717..a072703420a9a2cc942646e880fc1e482a7ebe37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-06  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/i386/pc/grub-install.in: Source
+       ${libdir}/grub/grub-mkconfig_lib before option processing, in order
+       that the --grub-probe option will work.
+       * util/sparc64/ieee1275/grub-install.in: Likewise.
+
 2009-10-05  Robert Millan  <rmh.grub@aybabtu.com>
 
        * configure.ac: Bump version to 1.97~beta4.

diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in
index 8ceb811ddc61caaa461a47f0b629bafdbffbef55..69028b6628eee377c512e9f9a1b1afd934517177 100644 (file)
--- a/util/i386/pc/grub-install.in
+++ b/util/i386/pc/grub-install.in
@@ -31,6 +31,9 @@ target_cpu=@target_cpu@
 platform=@platform@
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 
+# for make_system_path_relative_to_its_root()
+. ${libdir}/grub/grub-mkconfig_lib
+
 grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
 if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
     grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
@@ -141,9 +144,6 @@ for option in "$@"; do
     esac
 done
 
-# for make_system_path_relative_to_its_root()
-. ${libdir}/grub/grub-mkconfig_lib
-
 if test "x$install_device" = x; then
     echo "install_device not specified." 1>&2
     usage

diff --git a/util/sparc64/ieee1275/grub-install.in b/util/sparc64/ieee1275/grub-install.in
index 5cfb858d797cfe73b450ce78939a767c1bc7c3cf..a03869cb37b8c386dedf423a061ab220f478e4c7 100644 (file)
--- a/util/sparc64/ieee1275/grub-install.in
+++ b/util/sparc64/ieee1275/grub-install.in
@@ -31,6 +31,9 @@ target_cpu=@target_cpu@
 platform=@platform@
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 
+# for make_system_path_relative_to_its_root()
+. ${libdir}/grub/grub-mkconfig_lib
+
 grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
@@ -117,9 +120,6 @@ for option in "$@"; do
     esac
 done
 
-# for make_system_path_relative_to_its_root()
-. ${libdir}/grub/grub-mkconfig_lib
-
 if test "x$install_device" = x; then
     echo "install_device not specified." 1>&2
     usage