From: SangYoun Kwak Date: Fri, 10 Jun 2022 05:04:20 +0000 (+0900) Subject: Add '-l' option to blkid for optimization X-Git-Tag: submit/tizen/20220630.103030^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_unified;p=platform%2Fcore%2Fsystem%2Fsystem-recovery.git Add '-l' option to blkid for optimization Change-Id: If49848858f8ee0b3bd748e28e6006bef205a429d Signed-off-by: SangYoun Kwak --- diff --git a/scripts/recovery-init.in b/scripts/recovery-init.in index 277fe97..3d25893 100644 --- a/scripts/recovery-init.in +++ b/scripts/recovery-init.in @@ -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) } #------------------------------------------------