[OE-core] [PATCH] mkefidisk.sh: Cope with translations and modelnames with 'Disk' in it.

[Koen Kooi]

Op 8 mrt. 2013 om 18:09 heeft Darren Hart <dvhart at linux.intel.com> het volgende geschreven:

> 
> 
> On 03/08/2013 05:01 AM, Koen Kooi wrote:
>> The script greps for 'Disk', which doesn't work when your crazy Dutch distro has parted call it 'Schijf', so force LANG=C.
> 
> Whoopsie :-)
> 
>> 
>> The second problem is that 'Disk' might be a substring in the Model entry:
>> 
>> [root at 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 at dominion.thruhere.net>
>> ---
>> scripts/contrib/mkefidisk.sh | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>> 
>> diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
>> index 38e2217..44ac130 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//")
> 
> Looks like something like "^Disk /" might be better still?

Not sure, it still fragile either way


> 
> 
> 
> 
> -- 
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Technical Lead - Linux Kernel