* 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 2593d598b0991ba5a9bd66378108b35a53f95474..fa33902abe16a4e30c137e718dc75a5c131714af 100644 (file)
--- 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 3d2420b9197a13fca33ea9c7ef0ffb4e0f756c5b..f9e1510d121def084a12dfdcb28186ecb15286f2 100644 (file)
--- 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