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.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.sh')
| -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 f9e9768e43..06f03ed137 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 | |||
| 116 | cat /proc/mounts > /etc/mtab | 116 | cat /proc/mounts > /etc/mtab |
| 117 | fi | 117 | fi |
| 118 | 118 | ||
| 119 | disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") | 119 | disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") |
| 120 | 120 | ||
| 121 | grub_version=$(grub-install -v|sed 's/.* \([0-9]\).*/\1/') | 121 | grub_version=$(grub-install -v|sed 's/.* \([0-9]\).*/\1/') |
| 122 | 122 | ||