diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-09-27 07:15:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-27 22:23:00 +0100 |
commit | 2ff9d30dac1d0734547b0793bd5d1efb00d00f4e (patch) | |
tree | 211e0eefa8f09bbb3d6dca5bd64bef3288ddeea1 /meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh | |
parent | 2804850ea7b030be9b36ea1af03cd80d90466707 (diff) | |
download | poky-2ff9d30dac1d0734547b0793bd5d1efb00d00f4e.tar.gz |
init-install.sh: fix disk_size
It mis-matched "SanDisk" or "Disk Flags" before, which caused unexpected
error.
(From OE-Core rev: 346b6ef31253789d7d6664a19297b6deec9d27a0)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh | 2 |
1 files changed, 1 insertions, 1 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 7a0b4d4406..b562109157 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 | |||
69 | mkdir -p /tmp | 69 | mkdir -p /tmp |
70 | cat /proc/mounts > /etc/mtab | 70 | cat /proc/mounts > /etc/mtab |
71 | 71 | ||
72 | disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") | 72 | disk_size=$(parted /dev/${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") |
73 | 73 | ||
74 | testfs_size=$((disk_size*testfs_ratio/100)) | 74 | testfs_size=$((disk_size*testfs_ratio/100)) |
75 | rootfs_size=$((disk_size-boot_size-testfs_size)) | 75 | rootfs_size=$((disk_size-boot_size-testfs_size)) |