Add '-l' option to blkid for optimization 70/276170/1 accepted/tizen_6.5_unified accepted/tizen/6.5/unified/20220703.214252 accepted/tizen/6.5/unified/20220707.134234 submit/tizen_6.5/20220630.103256 submit/tizen_6.5/20220630.103849
authorSangYoun Kwak <sy.kwak@samsung.com>
Fri, 10 Jun 2022 05:04:20 +0000 (14:04 +0900)
committerHyotaek Shim <hyotaek.shim@samsung.com>
Fri, 10 Jun 2022 08:37:18 +0000 (08:37 +0000)
Change-Id: If49848858f8ee0b3bd748e28e6006bef205a429d
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>
(cherry picked from commit e38a11ae4551c15913ad08fbfa809301db5818c5)

scripts/recovery-init.in

index 277fe976ac0bb011f337b84c89e70dab56ae539e..3d25893b978f9221c80ddd79248c88b3a3b6f59f 100644 (file)
@@ -97,31 +97,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)
 }
 
 #------------------------------------------------