From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 26 Jul 2011 10:59:47 +0000 (+0100)
Subject: * util/grub-install.in: Don't source grub-mkconfig_lib until after
X-Git-Tag: 2.00~1146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=303b6246a3a44d51cf9263b754efbfe0e5f4272a;p=thirdparty%2Fgrub.git

* util/grub-install.in: Don't source grub-mkconfig_lib until after
processing arguments (otherwise help2man fails when GRUB has not yet
been installed).
---

diff --git a/ChangeLog b/ChangeLog
index 2593d598b..fa33902ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-26  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-install.in: Don't source grub-mkconfig_lib until after
+	processing arguments (otherwise help2man fails when GRUB has not yet
+	been installed).
+
 2011-07-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	New script grub-mkstandalone.
diff --git a/util/grub-install.in b/util/grub-install.in
index 3d2420b91..f9e1510d1 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -59,8 +59,6 @@ update_nvram=yes
 removable=no
 efi_quiet=
 
-. ${libdir}/@PACKAGE@/grub-mkconfig_lib
-
 # Get GRUB_DISTRIBUTOR.
 if test -f "${sysconfdir}/default/grub" ; then
     . "${sysconfdir}/default/grub"
@@ -265,6 +263,8 @@ do
     esac
 done
 
+. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+
 if test "x$install_device" = x && ([ "${target_cpu}-${platform}" = "i386-pc" ] \
     || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]); then
     echo "install_device not specified." 1>&2