Merge branch 'tizen' into tizen_6.5

Change-Id: Ia8ad4ebfbf31c90003112101e7e2792b3999eb2b
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --cc scripts/fota-init.sh
index eba1b9fd2735febb697fe029ae898cb64e208214,75e7fb92a2d754a662d419b6add82e7ace1a6f89..c4e609045a39b30967df45efde74df5a7112cee4
--- 1/scripts/fota-init.sh
--- 2/scripts/fota-init.sh
+++ b/scripts/fota-init.sh
@@@ -197,11 -209,15 +209,15 @@@ commit_partition(
  {
        LABEL=${1}
        MNT_POINT=${2}
 -      TYPE=$(blkid --match-token PARTLABEL="${LABEL}" -o value -s TYPE || blkid --match-token LABEL="${LABEL}" -o value -s TYPE | tail -n 1)
 +      TYPE=$(blkid --match-token LABEL="${LABEL}" -o value -s TYPE | tail -n 1)
        if [ "${TYPE}" = "ext4" ]; then
-               commit_bow_partition "${LABEL}"
+               if ! commit_bow_partition "${LABEL}"; then
+                       return 1
+               fi
        elif [ "${TYPE}" = "f2fs" ]; then
-               commit_f2fs_partition "${LABEL}"
+               if ! commit_f2fs_partition "${LABEL}"; then
+                       return 1
+               fi
        else
                log "[Info] Cannot commit ${LABEL}: Unsupported filesystem ${TYPE}" "${INT_LOG_FILE}"
        fi
@@@ -258,20 -283,28 +283,24 @@@ mount_partitions() 
                        return 1
                fi
        fi
-       if [ "${P_SUFFIX}" == "" ]; then
-               if [ ! "z${PART_HAL}" = "z" ]; then
 -      if [ ! "z${PART_HAL}" = "z" ]; then
 -              if [ "${P_SUFFIX}" == "" ]; then
++      if [ "${P_SUFFIX}" = "" ]; then
++              if [ ! "z${PART_HAL}" == "z" ]; then
                        if ! mount_checkpoint_partition hal "${PART_HAL}" "${FAKE_ROOT}/${HAL_MNT}"; then
                                return 1
                        fi
 -              else
 -                      if ! "$MOUNT" -o ro "${PART_HAL}" "${FAKE_ROOT}/${HAL_MNT}"; then
 -                              return 1
 -                      fi
                fi
-       else
-               "$MOUNT" "${PART_HAL}" "${FAKE_ROOT}/${HAL_MNT}"
        fi
  
-       "$MOUNT" -t proc none "${FAKE_ROOT}/proc"
-       "$MOUNT" -t sysfs none "${FAKE_ROOT}/sys"
-       "$MOUNT" -t devtmpfs devtmpfs "${FAKE_ROOT}/dev"
+       "$MOUNT" -t proc none "${FAKE_ROOT}/proc" &&
+       "$MOUNT" -t sysfs none "${FAKE_ROOT}/sys" &&
+       "$MOUNT" -t devtmpfs devtmpfs "${FAKE_ROOT}/dev" &&
        "$MOUNT" -t devpts devpts "${FAKE_ROOT}/dev/pts"
+ 
+       if [ $? -ne 0 ]; then
+               return 1
+       fi
+ 
+       return 0
  }
  
  umount_bow_partition()
@@@ -290,12 -329,18 +325,18 @@@ umount_partition(
        LABEL=${1}
        DIRECTORY=${2}
  
 -      TYPE=$(blkid --match-token PARTLABEL="${LABEL}" -o value -s TYPE || blkid --match-token LABEL="${LABEL}" -o value -s TYPE | tail -n 1)
 +      TYPE=$(blkid --match-token LABEL="${LABEL}" -o value -s TYPE | tail -n 1)
        if [ "${TYPE}" = "ext4" ]; then
-               umount_bow_partition "${LABEL}" "${DIRECTORY}"
+               if ! umount_bow_partition "${LABEL}" "${DIRECTORY}"; then
+                       return 1
+               fi
        else
-               "$UMOUNT" "${DIRECTORY}"
+               if ! "$UMOUNT" "${DIRECTORY}"; then
+                       return 1
+               fi
        fi
+ 
+       return 0
  }
  
  #------------------------------------------------

diff --cc scripts/fus_rw-init.sh
index 131f15a626b5eff0cc6c1d9a71f5fddda73ccf69,49543349c6e16b1e05a597293196cefeff172b84..dc1729263614c56e54298f0c687d003b859b3e96
--- 1/scripts/fus_rw-init.sh
--- 2/scripts/fus_rw-init.sh
+++ b/scripts/fus_rw-init.sh
@@@ -93,9 -96,31 +95,14 @@@ mount_rootfs(
                  echo "verifyboot: disabling"
                  ;;
          esac
-       "$MOUNT" -o ro "${PART_ROOTFS}" "${FAKE_ROOT}"
+ 
+       if ! "$MOUNT" -o ro "${PART_ROOTFS}" "${FAKE_ROOT}"; then
+               return 1
+       fi
+ 
+       return 0
  }
  
 -
 -#------------------------------------------------
 -#       mount_hal
 -#------------------------------------------------
 -mount_hal() {
 -    if [ "z${PART_HAL}" = "z" ]; then
 -        # No hal partition
 -        return 2
 -    fi
 -
 -    if ! "$MOUNT" -o ro "${PART_HAL}" "${FAKE_ROOT}/${HAL_MNT}"; then
 -          return 1
 -    fi
 -
 -    return 0
 -}
 -
  #------------------------------------------------
  #       mount_partitions
  #------------------------------------------------