From f1bde365724b63b0f2b97304167fe60da9fd44cd Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Fri, 22 Apr 2011 11:26:03 -0700 Subject: [PATCH] fix bug where the wrong SD Card block gets partitioned. rely on the ftsab to glean the sdcard mmcblk Change-Id: Idee8d3e147ba91c45a9f9fe91126c7b5a19ee38d --- utilities/sdparted | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/utilities/sdparted b/utilities/sdparted index 13e62f4..74e24a6 100755 --- a/utilities/sdparted +++ b/utilities/sdparted @@ -546,12 +546,29 @@ TTISMSDOS= SDSIZE= SDSIZEMB= -if [ -z "$SDPATH" ] +SDINFO=$(cat /etc/fstab | grep /sdcard | awk '{print $1}') +if [ -L "$SDINFO" ] then - SDPATH="/dev/block/mmcblk0" + SDPATH=$(ls -l $SDINFO | awk '{print $11}') else - echo Found SDPATH=$SDPATH + SDPATH=$SDINFO fi +# we may now have an SDPATH, let's make sure its on mmcblkX or mmcblkXp1 +CHECK_SDPATH1=$(echo $SDPATH | grep mmcblk.$) +CHECK_SDPATH2=$(echo $SDPATH | grep mmcblk.p1$) +if [ -z "$CHECK_SDPATH1" ] +then + if [ -z "$CHECK_SDPATH2" ] + then + echo fail1 + unset SDPATH + else + LEN=${#SDPATH} + BLKLEN=$(expr $LEN - 2) + SDPATH=${SDPATH:0:$BLKLEN} + fi +fi + FATSIZE= FATTYPE="fat32"