diff options
| author | California Sullivan <california.l.sullivan@intel.com> | 2017-11-21 13:47:02 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-02 11:25:33 +0000 |
| commit | 0b8460e2ce9f9a4ea8de8497fbb65b91cb69b8e0 (patch) | |
| tree | b38e46afeb73ff303c8a12fd764be5a265af9b57 | |
| parent | 4958d810aacb124ad21be8f3736a224e433817dc (diff) | |
| download | poky-0b8460e2ce9f9a4ea8de8497fbb65b91cb69b8e0.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: 38dcbd96e82b1c40576a0514f053266429dca5d1)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 2 |
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 | ||
| 133 | disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") | 133 | disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") |
| 134 | 134 | ||
| 135 | grub_version=$(grub-install -v|sed 's/.* \([0-9]\).*/\1/') | 135 | grub_version=$(grub-install -V|sed 's/.* \([0-9]\).*/\1/') |
| 136 | 136 | ||
| 137 | if [ $grub_version -eq 0 ] ; then | 137 | if [ $grub_version -eq 0 ] ; then |
| 138 | bios_boot_size=0 | 138 | bios_boot_size=0 |