Modify grep to built-in regex(=~), to remove confusing log message 89/279589/1 accepted/tizen/6.5/unified/20220812.130939 submit/tizen_6.5/20220812.080747
authorSangYoun Kwak <sy.kwak@samsung.com>
Fri, 12 Aug 2022 01:24:17 +0000 (10:24 +0900)
committerHyotaek Shim <hyotaek.shim@samsung.com>
Fri, 12 Aug 2022 03:51:20 +0000 (03:51 +0000)
Change-Id: I66a4f2685a1c94471dbc706a0d7b0337c3ba532a
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>
scripts/upgrade-common.inc

index 8dee72751d289e89b774221eb90c659266133908..e2604ad6db85aa1ba5d30269fbb3ed055cba430f 100644 (file)
@@ -108,8 +108,11 @@ check_ab_partition_scheme() {
 }
 
 check_used_block_device() {
+       local MAPPER_MATCH_REGEX='.*/dev/mapper.*'
        ROOTFS_DEVICE="$(findmnt / -no SOURCE)"
-       if MAPPER_DEVICE="$(echo ${ROOTFS_DEVICE} | grep /dev/mapper)"; then
+       MAPPER_DEVICE=""
+       if [[ "${ROOTFS_DEVICE}" =~ ${MAPPER_MATCH_REGEX} ]]; then
+               MAPPER_DEVICE="${ROOTFS_DEVICE}"
                DM_NAME=$(basename "${MAPPER_DEVICE}")
                DM_N=$(dmsetup ls -o blkdevname | grep "${DM_NAME}" | sed -e 's/^.*(\([^)]\+\))/\1/')
                ROOTFS_DEVICE="/dev/$(ls /sys/class/block/${DM_N}/slaves/)"