* [PATCH][Jethro] init-install.sh: fix disk_size
@ 2016-09-27 14:15 Saul Wold
2016-10-06 20:59 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2016-09-27 14:15 UTC (permalink / raw)
To: openembedded-core, richard.purdie
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][Jethro] init-install.sh: fix disk_size
2016-09-27 14:15 [PATCH][Jethro] init-install.sh: fix disk_size Saul Wold
@ 2016-10-06 20:59 ` Saul Wold
2016-10-06 21:23 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2016-10-06 20:59 UTC (permalink / raw)
To: openembedded-core, richard.purdie; +Cc: Ross Burton
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][Jethro] init-install.sh: fix disk_size
2016-10-06 20:59 ` Saul Wold
@ 2016-10-06 21:23 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2016-10-06 21:23 UTC (permalink / raw)
To: Saul Wold, openembedded-core; +Cc: Ross Burton
On Thu, 2016-10-06 at 13:59 -0700, Saul Wold wrote:
> Ping
Didn't this merge on 27th September?
http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=jethro&id=2ff9d30da
c1d0734547b0793bd5d1efb00d00f4e
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-06 21:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-27 14:15 [PATCH][Jethro] init-install.sh: fix disk_size Saul Wold
2016-10-06 20:59 ` Saul Wold
2016-10-06 21:23 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox