From: Cal Sullivan <california.l.sullivan@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 1/2] init-install: fix grub-install command
Date: Thu, 7 Dec 2017 10:19:11 -0800 [thread overview]
Message-ID: <c787ba10-43f1-0e9b-e22f-192d19ff2f58@intel.com> (raw)
In-Reply-To: <20171121214703.11109-1-california.l.sullivan@intel.com>
Hi Armin,
This is also suitable for Rocko. Please add it to your backport queue
when you can.
Its in master here:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=0b8460e2ce9f9a4ea8de8497fbb65b91cb69b8e0
Thanks,
Cal
On 11/21/2017 01:47 PM, California Sullivan wrote:
> 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>
> ---
> meta/recipes-core/initrdscripts/files/init-install.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
> index 572613e..1cac806 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
prev parent reply other threads:[~2017-12-07 18:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 21:47 [PATCH 1/2] init-install: fix grub-install command California Sullivan
2017-11-21 21:47 ` [PATCH 2/2] install*.sh: add short sleep after parted commands California Sullivan
2017-11-21 22:27 ` Saul Wold
2017-11-21 23:02 ` [PATCH v2 " California Sullivan
2017-11-21 23:04 ` Wold, Saul
2017-12-07 18:19 ` Cal Sullivan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c787ba10-43f1-0e9b-e22f-192d19ff2f58@intel.com \
--to=california.l.sullivan@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox