From ee5611779ee5f2670d0d60c4718fb2024b1ba8ac Mon Sep 17 00:00:00 2001 From: SangYoun Kwak Date: Fri, 10 Jun 2022 13:25:20 +0900 Subject: [PATCH 1/1] Add '-l' option to blkid for optimization Change-Id: Ibd6c82033e57e6e87df35390c0d1da914329b5be Signed-off-by: SangYoun Kwak --- scripts/fota-init.sh | 12 ++++++------ scripts/fus_rw-init.sh | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/fota-init.sh b/scripts/fota-init.sh index da41cad..e49de49 100755 --- a/scripts/fota-init.sh +++ b/scripts/fota-init.sh @@ -75,31 +75,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) } mount_bow_partition() { @@ -172,7 +172,7 @@ commit_bow_partition() commit_f2fs_partition() { LABEL=${1} - PART_SYSTEM_DATA=$(blkid --match-token PARTLABEL="${LABEL}" -o device || blkid --match-token LABEL="${LABEL}" -o device) + PART_SYSTEM_DATA=$(blkid --match-token PARTLABEL="${LABEL}" -o device -l || blkid --match-token LABEL="${LABEL}" -o device -l) "${MOUNT}" -o remount,checkpoint=enable "${PART_SYSTEM_DATA}" log "[Info] Changes on partition ${LABEL} commited (f2fs)" "${INT_LOG_FILE}" } diff --git a/scripts/fus_rw-init.sh b/scripts/fus_rw-init.sh index 335cd39..f9cbb78 100755 --- a/scripts/fus_rw-init.sh +++ b/scripts/fus_rw-init.sh @@ -28,31 +28,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) } #------------------------------------------------ -- 2.7.4