[2624] 2009-10-06 Colin Watson <[email protected]>

Revision: 2624
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2624
Author:   cjwatson
Date:     2009-10-05 23:33:36 +0000 (Mon, 05 Oct 2009)
Log Message:
-----------
2009-10-06  Colin Watson  <[email protected]>

	* 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/i386/pc/grub-install.in
    trunk/grub2/util/sparc64/ieee1275/grub-install.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-10-05 17:57:36 UTC (rev 2623)
+++ trunk/grub2/ChangeLog	2009-10-05 23:33:36 UTC (rev 2624)
@@ -1,3 +1,10 @@
+2009-10-06  Colin Watson  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* configure.ac: Bump version to 1.97~beta4.

Modified: trunk/grub2/util/i386/pc/grub-install.in
===================================================================
--- trunk/grub2/util/i386/pc/grub-install.in	2009-10-05 17:57:36 UTC (rev 2623)
+++ trunk/grub2/util/i386/pc/grub-install.in	2009-10-05 23:33:36 UTC (rev 2624)
@@ -31,6 +31,9 @@
 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 @@
     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

Modified: trunk/grub2/util/sparc64/ieee1275/grub-install.in
===================================================================
--- trunk/grub2/util/sparc64/ieee1275/grub-install.in	2009-10-05 17:57:36 UTC (rev 2623)
+++ trunk/grub2/util/sparc64/ieee1275/grub-install.in	2009-10-05 23:33:36 UTC (rev 2624)
@@ -31,6 +31,9 @@
 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 @@
     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