From 5848c5c745c3e7c9b143323f99fd1feb0a7f3ccb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Mar 2013 14:01:45 +0100 Subject: 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 (From OE-Core rev: 2e404930f6fc7d818d2f429793e84bce77163afd) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- scripts/contrib/mkefidisk.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') 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)) -- cgit v1.2.3-54-g00ecf