From: Saul Wold <saul.wold@intel.com>
To: openembedded-core@lists.openembedded.org,
richard.purdie@linuxfoundation.org
Cc: Ross Burton <ross@linux.intel.com>
Subject: Re: [PATCH][Jethro] init-install.sh: fix disk_size
Date: Thu, 06 Oct 2016 13:59:17 -0700 [thread overview]
Message-ID: <1475787557.18115.216.camel@intel.com> (raw)
In-Reply-To: <1474985736-17783-1-git-send-email-sgw@linux.intel.com>
Ping
On Tue, 2016-09-27 at 07:15 -0700, Saul Wold wrote:
> From: Robert Yang <liezhi.yang@windriver.com>
>
> It mis-matched "SanDisk" or "Disk Flags" before, which caused
> unexpected
> error.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit a68ac76c1b6ed4c1a2fbc944c5021c89fd26217f)
> [YOCTO #10333]
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> This is fixed in both Master and Krogoth and just needs a backport to
> Jethro to address an open bug.
>
> meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh | 2
> +-
> meta/recipes-core/initrdscripts/files/init-install-efi.sh | 2
> +-
> meta/recipes-core/initrdscripts/files/init-install.sh | 2
> +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-
> testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-
> testfs.sh
> index 7a0b4d4..b562109 100644
> --- a/meta/recipes-core/initrdscripts/files/init-install-efi-
> testfs.sh
> +++ b/meta/recipes-core/initrdscripts/files/init-install-efi-
> testfs.sh
> @@ -69,7 +69,7 @@ umount /dev/${device}* 2> /dev/null || /bin/true
> mkdir -p /tmp
> cat /proc/mounts > /etc/mtab
>
> -disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut
> -d" " -f 3 | sed -e "s/MB//")
> +disk_size=$(parted /dev/${device} unit mb print | grep '^Disk .*:
> .*MB' | cut -d" " -f 3 | sed -e "s/MB//")
>
> testfs_size=$((disk_size*testfs_ratio/100))
> rootfs_size=$((disk_size-boot_size-testfs_size))
> diff --git a/meta/recipes-core/initrdscripts/files/init-install-
> efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
> index 0443a9d..3531158 100644
> --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
> +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
> @@ -120,7 +120,7 @@ if [ ! -e /etc/mtab ]; then
> cat /proc/mounts > /etc/mtab
> fi
>
> -disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" "
> -f 3 | sed -e "s/MB//")
> +disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' |
> cut -d" " -f 3 | sed -e "s/MB//")
>
> swap_size=$((disk_size*swap_ratio/100))
> rootfs_size=$((disk_size-boot_size-swap_size))
> diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
> b/meta/recipes-core/initrdscripts/files/init-install.sh
> index f9e9768..06f03ed 100644
> --- a/meta/recipes-core/initrdscripts/files/init-install.sh
> +++ b/meta/recipes-core/initrdscripts/files/init-install.sh
> @@ -116,7 +116,7 @@ if [ ! -L /etc/mtab ]; then
> cat /proc/mounts > /etc/mtab
> fi
>
> -disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" "
> -f 3 | sed -e "s/MB//")
> +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/')
>
> --
> 2.7.4
>
next prev parent reply other threads:[~2016-10-06 20:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 14:15 [PATCH][Jethro] init-install.sh: fix disk_size Saul Wold
2016-10-06 20:59 ` Saul Wold [this message]
2016-10-06 21:23 ` Richard Purdie
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=1475787557.18115.216.camel@intel.com \
--to=saul.wold@intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
--cc=ross@linux.intel.com \
/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