init-install.sh: fix disk_size
It mis-matched "SanDisk" or "Disk Flags" before, which caused unexpected error. (From OE-Core rev: a68ac76c1b6ed4c1a2fbc944c5021c89fd26217f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
46eed0a4aa
commit
3ce7d8cdc8
|
@ -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))
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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/')
|
||||
|
||||
|
|
Loading…
Reference in New Issue