change a method to get partition info 13/158113/1 accepted/tizen/unified/20171031.175038 submit/tizen/20171031.030559
authorMyoungJune Park <mj2004.park@samsung.com>
Mon, 30 Oct 2017 01:52:19 +0000 (10:52 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Mon, 30 Oct 2017 01:52:59 +0000 (10:52 +0900)
Change-Id: I40943fe418ce723041e2023c88f08b34a2ba90bc
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>
script/run-factory-reset.sh

index 800a413a770713b41bb88ee6a80ff444e3e1b6f9..54869060a05e995c7a48104d24404b7310e81bee 100755 (executable)
@@ -125,7 +125,8 @@ fs_ready() {
        /bin/mkdir -p $USRDATADIR
        /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=`/bin/grep "$USRDATADIR" /etc/fstab | /usr/bin/awk '{print $1}'`
+       device=`blkid --match-token PARTLABEL=user -o device`
        device=`/usr/bin/readlink -f $device`
        if [[ "z$mret" != "z" && "$mret" != "$device" ]]; then
                echo "$mret != $device" >> $logfile
@@ -136,6 +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`
                /sbin/mkfs.$fstype $device -F
                /bin/mount -t $fstype $device $USRDATADIR
        fi