vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-install.in: Don't source grub-mkconfig_lib until after

Browse source 
processing arguments (otherwise help2man fails when GRUB has not yet
been installed).
This commit is contained in:
Colin Watson 2011-07-26 11:59:47 +01:00
parent 41aa28ea2a
commit 303b6246a3
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2011-07-25 Vladimir Serbinenko <phcoder@gmail.com>
New script grub-mkstandalone. New script grub-mkstandalone.

4
util/grub-install.in
View file

@ -59,8 +59,6 @@ update_nvram=yes
removable=no removable=no
efi_quiet= efi_quiet=
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
# Get GRUB_DISTRIBUTOR. # Get GRUB_DISTRIBUTOR.
if test -f "${sysconfdir}/default/grub" ; then if test -f "${sysconfdir}/default/grub" ; then
. "${sysconfdir}/default/grub" . "${sysconfdir}/default/grub"
@ -265,6 +263,8 @@ do
esac esac
done done
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
if test "x$install_device" = x && ([ "${target_cpu}-${platform}" = "i386-pc" ] \ if test "x$install_device" = x && ([ "${target_cpu}-${platform}" = "i386-pc" ] \
|| [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]); then || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]); then
echo "install_device not specified." 1>&2 echo "install_device not specified." 1>&2