From 9fd2c27a63e99d30887170d32a6d2c697f6c3f7d Mon Sep 17 00:00:00 2001 From: Sunmin Lee Date: Fri, 3 Nov 2017 12:21:55 +0900 Subject: Use filesystem label instead of partition label In some platform targets, partition label is not set. Because filesystem label is available for all targets, it is better to be used. Signed-off-by: Sunmin Lee (cherry picked from commit 0cb743032addad41c2dc73cc2101e62216d58c8c) Change-Id: I26bd4444359d2d3f82c3a396b6f402eb465b087e --- script/run-factory-reset.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/run-factory-reset.sh b/script/run-factory-reset.sh index 5486906..30307fe 100755 --- a/script/run-factory-reset.sh +++ b/script/run-factory-reset.sh @@ -126,7 +126,7 @@ fs_ready() { /bin/mount $USRDATADIR mret=`/bin/grep "$USRDATADIR " /proc/mounts | /usr/bin/awk '{print $1}'` #device=`/bin/grep "$USRDATADIR" /etc/fstab | /usr/bin/awk '{print $1}'` - device=`blkid --match-token PARTLABEL=user -o device` + device=`blkid --match-token LABEL=user -o device` device=`/usr/bin/readlink -f $device` if [[ "z$mret" != "z" && "$mret" != "$device" ]]; then echo "$mret != $device" >> $logfile @@ -137,7 +137,7 @@ fs_ready() { # mount failed. format and remount echo "$USRDATADIR mount failed. format and retry to mount again" >> $logfile fstype=`/bin/grep "$USRDATADIR " /etc/fstab | /usr/bin/awk '{print $3}'` - fstype=`blkid --match-token PARTLABEL=user -o device` + fstype=`blkid --match-token LABEL=user -o device` /sbin/mkfs.$fstype $device -F /bin/mount -t $fstype $device $USRDATADIR fi -- cgit v1.2.3