aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSullivan, California L <california.l.sullivan@intel.com>2017-12-20 16:56:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-06 10:11:42 +0000
commit030a2ac1b434377c05e44014f71d217c1f96f2be (patch)
treee403fb952e181509a91a16e2ffee6174d5bee1ec
parent9497127e071d1a5408e04a47fcb7bd29775ec1c6 (diff)
downloadopenembedded-core-030a2ac1b434377c05e44014f71d217c1f96f2be.tar.gz
init-install: fix grub-install command
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>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 572613ecd4..1cac8064a2 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -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