]> code.ossystems Code Review - openembedded-core.git/commitdiff
init-install: fix grub-install command
authorSullivan, California L <california.l.sullivan@intel.com>
Thu, 21 Dec 2017 00:56:36 +0000 (16:56 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 6 Jan 2018 10:11:42 +0000 (10:11 +0000)
The grub_version variable was calling 'grub-install -v' (verbose) instead
of 'grub-install -V' (version) causing unexpected failures.

Fixes bug [YOCTO #12111].

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 38dcbd96e82b1c40576a0514f053266429dca5d1)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-core/initrdscripts/files/init-install.sh

index 572613ecd4cd579bec1cfaefa0b9dc7a01d4f7d4..1cac8064a224cbbbab9ca73c80ed8136d63367e2 100644 (file)
@@ -132,7 +132,7 @@ fi
 
 disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//")
 
-grub_version=$(grub-install -v|sed 's/.* \([0-9]\).*/\1/')
+grub_version=$(grub-install -V|sed 's/.* \([0-9]\).*/\1/')
 
 if [ $grub_version -eq 0 ] ; then
     bios_boot_size=0