Add '-l' option to blkid for optimization 30/276130/1
authorSangYoun Kwak <sy.kwak@samsung.com>
Fri, 10 Jun 2022 02:46:09 +0000 (11:46 +0900)
committerSangYoun Kwak <sy.kwak@samsung.com>
Fri, 10 Jun 2022 02:46:09 +0000 (11:46 +0900)
Change-Id: I776afec6cb7167996d1242db0e76f5281c47cf00
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>
src/initrd-recovery/init

index a23c598..4ba9a29 100755 (executable)
@@ -62,31 +62,31 @@ get_partition_id() {
         echo "Using A/B slot: ${P_SLOT}"
     fi
 
-    PART_ROOTFS=`/sbin/blkid -t PARTLABEL=rootfs${P_SUFFIX} -o device`
+    PART_ROOTFS=`/sbin/blkid -t PARTLABEL=rootfs${P_SUFFIX} -o device -l`
     if [ x$PART_ROOTFS = "x" ]
     then
         PART_ROOTFS=`/sbin/blkid -L rootfs`
     fi
 
-    PART_SYSTEM_DATA=`/sbin/blkid -t PARTLABEL=system-data -o device`
+    PART_SYSTEM_DATA=`/sbin/blkid -t PARTLABEL=system-data -o device -l`
     if [ x$PART_SYSTEM_DATA = "x" ]
     then
         PART_SYSTEM_DATA=`/sbin/blkid -L system-data`
     fi
 
-    PART_RAMDISK=`/sbin/blkid -t PARTLABEL=ramdisk${P_SUFFIX} -o device`
+    PART_RAMDISK=`/sbin/blkid -t PARTLABEL=ramdisk${P_SUFFIX} -o device -l`
     if [ x$PART_RAMDISK = "x" ]
     then
         PART_RAMDISK=`/sbin/blkid -L ramdisk`
     fi
 
-    PART_HAL=`/sbin/blkid -t PARTLABEL=hal${P_SUFFIX} -o device`
+    PART_HAL=`/sbin/blkid -t PARTLABEL=hal${P_SUFFIX} -o device -l`
     if [ x$PART_HAL = "x" ]
     then
         PART_HAL=`/sbin/blkid -L hal`
     fi
 
-    PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device || "$BLKID" --match-token LABEL=user -o device)
+    PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device -l || "$BLKID" --match-token LABEL=user -o device -l)
 }
 
 #------------------------------------------------
@@ -108,7 +108,7 @@ copy_hal_data() {
         fi
     done < /hal/.hal_list
 
-    PART_HAL=$("$BLKID" -t PARTLABEL="hal${P_SUFFIX}" -o device)
+    PART_HAL=$("$BLKID" -t PARTLABEL="hal${P_SUFFIX}" -o device -l)
     if [ "$need_copy" = "1" -a "z$PART_HAL" != "z" ]; then
         #mount hal partition
         "$MKDIR" -p ${HAL_PATH}