Eliminate partx dependency

The blkid can covers all the operations in fota/fus_rw script.
Because partx is supposed to be dropped from initrd-recovery,
eliminate partx in initrd-fota, too.

Change-Id: I8c16ceab2e2a51ec666e4480a8f5a0eb2f827774
Signed-off-by: Sunmin Lee <sunm.lee@samsung.com>

diff --git a/scripts/fota-init.sh b/scripts/fota-init.sh
index 4b65500..d3be755 100755 (executable)
--- a/scripts/fota-init.sh
+++ b/scripts/fota-init.sh
@@ -31,7 +31,6 @@ UMOUNT="/bin/umount"
 GREP="/bin/grep"
 CUT="/usr/bin/cut"
 TR="/usr/bin/tr"
-PARTX="/usr/sbin/partx"
 BLKID="/usr/sbin/blkid"
 SORT="/usr/bin/sort"
 SED="/usr/bin/sed"
@@ -47,30 +46,9 @@ USER_MNT=opt/usr
 #       get partition id
 #------------------------------------------------
 get_partition_id() {
-       EMMC_DEVICE="/dev/mmcblk0"
-       RET_PARTX=$("$PARTX" -s ${EMMC_DEVICE})
-       TEST=$(echo "$RET_PARTX" | "$TR" -s ' ' | "$SED" -e '1d' -e 's/^ //' | "$CUT" -d ' ' -f 6)
-       if [ "z$TEST" == "z" ]; then
-               PART_ROOTFS=$("$BLKID" -L "rootfs" -o device)
-               PART_SYSTEM_DATA=$("$BLKID" -L "system-data" -o device)
-               PART_USER=$("$BLKID" -L "user" -o device)
-       else
-               PART_ROOTFS=${EMMC_DEVICE}p$(
-                       echo "$RET_PARTX" |
-                       "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' |
-                       "$GREP" "rootfs" | "$SED" 's/^ //' |
-                       "$CUT" -d ' ' -f 1)
-               PART_SYSTEM_DATA=${EMMC_DEVICE}p$(
-                       echo "$RET_PARTX" |
-                       "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' |
-                       "$GREP" "system-data" | "$SED" 's/^ //' |
-                       "$CUT" -d ' ' -f 1)
-               PART_USER=${EMMC_DEVICE}p$(
-                       echo "$RET_PARTX" |
-                       "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' |
-                       "$GREP" "user" | "$SED" 's/^ //' |
-                       "$CUT" -d ' ' -f 1)
-       fi
+       PART_ROOTFS=$("$BLKID" --match-token PARTLABEL=rootfs -o device || "$BLKID" --match-token LABEL=rootfs -o device)
+       PART_SYSTEM_DATA=$("$BLKID" --match-token PARTLABEL=system-data -o device || "$BLKID" --match-token LABEL=system-data -o device)
+       PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device || "$BLKID" --match-token LABEL=user -o device)
 }
 
 #------------------------------------------------
@@ -146,23 +124,15 @@ handle_no_ua() {
 do_create_part_table() {
 
        EMMC_DEVICE="/dev/mmcblk0"
-       RET_PARTX=$("$PARTX" -s ${EMMC_DEVICE})
-       TEST=$(echo "$RET_PARTX" | "$TR" -s ' ' | "$SED" -e '1d' -e 's/^ //' | "$CUT" -d ' ' -f 6)
-       if [ "z$TEST" == "z" ]; then
-               RET_PARTX=$("$BLKID" -o full | "$GREP" ${EMMC_DEVICE}p |
-                               "$SED" -e 's/\/dev\/mmcblk0p//g' -e 's/\ .*LABEL=\"\(.*\).*$/\1/' |
-                               "$CUT" -d '"' -f 1 | "$SED" 's/\:/\ /' |
-                               "$TR" '[:lower:]' '[:upper:]' |
-                               "$SORT" -k 1 -n)
-       else
-               RET_PARTX=$("$PARTX" -s ${EMMC_DEVICE} | "$SED" -e '1d' -e 's/^ //' |
-                               "$TR" -s ' ' | "$CUT" -d ' ' -f 1,6 |
-                               "$TR" '[:lower:]' '[:upper:]')
-       fi
-       PART_NUM=$(echo "$RET_PARTX" | "$WC" -l)
+       PART_LIST=$("$BLKID" -o full | "$GREP" ${EMMC_DEVICE}p |
+                       "$SED" -e 's/\/dev\/mmcblk0p//g' -e 's/\ .*LABEL=\"\(.*\).*$/\1/' |
+                       "$CUT" -d '"' -f 1 | "$SED" 's/\:/\ /' |
+                       "$TR" '[:lower:]' '[:upper:]' |
+                       "$SORT" -k 1 -n)
+       PART_NUM=$(echo "$PART_LIST" | "$WC" -l)
 
        echo "$PART_NUM" > ${PART_TBL_PATH}
-       echo "$RET_PARTX" >> ${PART_TBL_PATH}
+       echo "$PART_LIST" >> ${PART_TBL_PATH}
        "$SYNC"
 }
 

diff --git a/scripts/fus_rw-init.sh b/scripts/fus_rw-init.sh
index 917ba98..4877f4b 100755 (executable)
--- a/scripts/fus_rw-init.sh
+++ b/scripts/fus_rw-init.sh
@@ -14,11 +14,7 @@ CAT="/bin/cat"
 MOUNT="/bin/mount"
 UMOUNT="/bin/umount"
 GREP="/bin/grep"
-CUT="/usr/bin/cut"
-TR="/usr/bin/tr"
-PARTX="/usr/sbin/partx"
 BLKID="/usr/sbin/blkid"
-SED="/usr/bin/sed"
 
 SYSTEM_DATA_MNT=opt
 USER_MNT=opt/usr
@@ -27,30 +23,9 @@ USER_MNT=opt/usr
 #       get partition id
 #------------------------------------------------
 get_partition_id() {
-    EMMC_DEVICE="/dev/mmcblk0"
-    RET_PARTX=$("$PARTX" -s ${EMMC_DEVICE})
-    TEST=$(echo "$RET_PARTX" | "$TR" -s ' ' | "$SED" -e '1d' -e 's/^ //' | "$CUT" -d ' ' -f 6)
-    if [ "z$TEST" == "z" ]; then
-        PART_ROOTFS=$("$BLKID" -L "rootfs" -o device)
-        PART_SYSTEM_DATA=$("$BLKID" -L "system-data" -o device)
-        PART_USER=$("$BLKID" -L "user" -o device)
-    else
-        PART_ROOTFS=${EMMC_DEVICE}p$(
-            echo "$RET_PARTX" |
-            "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' |
-            "$GREP" "rootfs" | "$SED" 's/^ //' |
-            "$CUT" -d ' ' -f 1)
-        PART_SYSTEM_DATA=${EMMC_DEVICE}p$(
-            echo "$RET_PARTX" |
-            "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' |
-            "$GREP" "system-data" | "$SED" 's/^ //' |
-            "$CUT" -d ' ' -f 1)
-        PART_USER=${EMMC_DEVICE}p$(
-            echo "$RET_PARTX" |
-            "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' |
-            "$GREP" "user" | "$SED" 's/^ //' |
-            "$CUT" -d ' ' -f 1)
-    fi
+    PART_ROOTFS=$("$BLKID" --match-token PARTLABEL=rootfs -o device || "$BLKID" --match-token LABEL=rootfs -o device)
+    PART_SYSTEM_DATA=$("$BLKID" --match-token PARTLABEL=system-data -o device || "$BLKID" --match-token LABEL=system-data -o device)
+    PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device || "$BLKID" --match-token LABEL=user -o device)
 }
 
 #------------------------------------------------