summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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:13:55 +0000
commit1affca64b917fd22087d12a6313aea6b00801ba0 (patch)
tree8eadcb731f3f0e2498d0606942c7eef99e7464aa /meta/recipes-core
parent003fc0f43cdb630b706aa88020211555a0ce4224 (diff)
downloadpoky-1affca64b917fd22087d12a6313aea6b00801ba0.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]. (From OE-Core rev: 030a2ac1b434377c05e44014f71d217c1f96f2be) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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
132 132
133disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") 133disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//")
134 134
135grub_version=$(grub-install -v|sed 's/.* \([0-9]\).*/\1/') 135grub_version=$(grub-install -V|sed 's/.* \([0-9]\).*/\1/')
136 136
137if [ $grub_version -eq 0 ] ; then 137if [ $grub_version -eq 0 ] ; then
138 bios_boot_size=0 138 bios_boot_size=0