diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2013-03-08 14:01:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-09 06:11:01 +0000 |
| commit | 2e404930f6fc7d818d2f429793e84bce77163afd (patch) | |
| tree | 18d2a40f2b19b39bb2a4b76560cdde6e14bed66e /scripts/contrib | |
| parent | 0b836b9d79255a5b2f358fe718c67638f52ecf72 (diff) | |
| download | openembedded-core-2e404930f6fc7d818d2f429793e84bce77163afd.tar.gz openembedded-core-2e404930f6fc7d818d2f429793e84bce77163afd.tar.bz2 openembedded-core-2e404930f6fc7d818d2f429793e84bce77163afd.zip | |
mkefidisk.sh: Cope with translations and modelnames with 'Disk' in it.
The script greps for 'Disk', which doesn't work when your crazy Dutch distro has parted call it 'Schijf', so force LANG=C.
The second problem is that 'Disk' might be a substring in the Model entry:
[root@Angstrom-F16-vm-rpm contrib] # parted /dev/sdc unit mb print
Model: SanDisk SDDR-113 (scsi)
Disk /dev/sdc: 3905MB
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib')
| -rwxr-xr-x | scripts/contrib/mkefidisk.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 38e22176e3..44ac130a68 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +LANG=C + # # Defaults # @@ -123,7 +125,7 @@ fi # # Partition $DEVICE # -DEVICE_SIZE=$(parted $DEVICE unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") +DEVICE_SIZE=$(parted $DEVICE unit mb print | grep ^Disk | cut -d" " -f 3 | sed -e "s/MB//") SWAP_SIZE=$((DEVICE_SIZE*SWAP_RATIO/100)) ROOTFS_SIZE=$((DEVICE_SIZE-BOOT_SIZE-SWAP_SIZE)) ROOTFS_START=$((BOOT_SIZE)) |