sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle non-script grub2-install

Browse Source 
grub2-install has been re-written [1] so isn't always a shell script,
so just exec it directly.  Also use $() as that follows the rest of
the file.

[1] http://git.savannah.gnu.org/cgit/grub.git/commit?id=cd46aa6cefabd7b0fcb15cd614577e1ab8c7a841

Change-Id: Ib4fd7c6854fb485c0da6a79babf4a3d45a8a0f2c
This commit is contained in:
Ian Wienand 2014-07-15 10:41:35 +10:00
parent c9bcce2030
commit 13eaa40e5e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/vm/finalise.d/51-bootloader
View File

@ -42,9 +42,9 @@ function install_grub2 {
# XXX: grub-probe on the nbd0/loop0 device returns nothing - workaround, manually # XXX: grub-probe on the nbd0/loop0 device returns nothing - workaround, manually
# specify modules. https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1073731 # specify modules. https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1073731
GRUBNAME=`which grub-install` || echo "trying grub2-install" GRUBNAME=$(which grub-install) || echo "trying grub2-install"
if [ -z "$GRUBNAME" ]; then if [ -z "$GRUBNAME" ]; then
GRUBNAME="bash -x `which grub2-install`" GRUBNAME=$(which grub2-install)
fi fi
# If no GRUB2 is found, fallback to extlinux # If no GRUB2 is found, fallback to extlinux