From: Antoni <a.adaszkiewi@samsung.com>
Date: Fri, 15 Mar 2024 09:56:23 +0000 (+0100)
Subject: Refactor and unify logging in upgrade-support scripts
X-Git-Tag: accepted/tizen/unified/20240430.020633~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a2fb8479123e94a5800da0c1092a849f7421bd6;p=platform%2Fcore%2Fsystem%2Fupgrade.git

Refactor and unify logging in upgrade-support scripts

All messages will now be both logged to file and printed.

Change-Id: I7be56b787027f5f8e2d626e2c078b6aedabb31cc
---

diff --git a/scripts/clone_partitions/clone_partitions.sh b/scripts/clone_partitions/clone_partitions.sh
index e122b99..dcce216 100644
--- a/scripts/clone_partitions/clone_partitions.sh
+++ b/scripts/clone_partitions/clone_partitions.sh
@@ -2,40 +2,7 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 FLOCK_PATH="/var/lock/clone_partitions.lock"
 
-SCRIPT_NAME="clone_partitions.sh"
-
-#------------------------------------------------
-#       critical_log msg [file]
-#------------------------------------------------
-critical_log() {
-	# log format: [script_name][tag]actual_log
-	LOG="[${SCRIPT_NAME}]$1"
-	dlogsend -k "$LOG"
-	if [ "$2" != "" ]; then
-		echo "$LOG" >> "$2"
-	fi
-	echo "$LOG"
-
-	return 0;
-}
-
-#------------------------------------------------
-#       log msg [file]
-#------------------------------------------------
-log() {
-	# log format: [script_name][tag]actual_log
-	LOG="[${SCRIPT_NAME}]$1"
-	if [ "$2" != "" ]; then
-		echo "$LOG" >> "$2"
-	fi
-	echo "$LOG"
-
-	return 0;
-}
-
 do_clone() {
-	. /usr/libexec/upgrade-support/upgrade-common.inc
-
 	check_ab_partition_scheme
 	check_used_block_device
 	load_background_copy_list
@@ -73,6 +40,10 @@ if [ ! -z "${UPGRADE_DEBUG}" ]; then
 	set -x
 fi
 
+. /usr/libexec/upgrade-support/upgrade-common.inc
+
+set_script_name_and_log_file "${BASH_SOURCE[0]}"
+
 (
 flock 9
 case $1 in
diff --git a/scripts/upgrade-support/upgrade-common.inc b/scripts/upgrade-support/upgrade-common.inc
index 66ccd5e..8d9d95f 100644
--- a/scripts/upgrade-support/upgrade-common.inc
+++ b/scripts/upgrade-support/upgrade-common.inc
@@ -14,6 +14,11 @@ ROOTFS_NEXT_SIZE=0
 HAL_CURR_SIZE=0
 HAL_NEXT_SIZE=0
 
+UPGRADE_LOG_DIR="/opt/var/log/fota"
+UPGRADE_LOG_FILE="$UPGRADE_LOG_DIR/upgrade.log"
+UPGRADE_SUPPORT_SCRIPT_NAMES=("upgrade-prepare-partitions.sh" "upgrade-trigger.sh" \
+	"upgrade-partial.sh" "upgrade-fota.sh")
+
 if [ -z $BLKID_PRINT ]; then
 	BLKID_PRINT="/usr/bin/blkid-print"
 fi
@@ -22,41 +27,47 @@ if [ -z $RESIZE_DYNPARTS ]; then
 	RESIZE_DYNPARTS="/bin/resize-dynparts"
 fi
 
-#------------------------------------------------
-#       critical_log msg [file]
-#------------------------------------------------
-critical_log() {
-	# log format: [script_name][tag]actual_log
-	LOG="[${SCRIPT_NAME}]$1"
-	dlogsend -k "$LOG"
-	if [ "$2" != "" ]; then
-		echo "[$(date +"%d/%m/%Y %H:%M:%S")]" "$LOG" >> "$2"
+upgrade_log_init() {
+	if [ ! -d "$UPGRADE_LOG_DIR" ]; then
+		mkdir -p "$UPGRADE_LOG_DIR"
 	fi
-	echo "$LOG"
 
-	return 0
+	if [ -e "$UPGRADE_LOG_FILE" ]; then
+		rm "$UPGRADE_LOG_FILE"
+		touch "$UPGRADE_LOG_FILE"
+	fi
+
+	echo "[Info] Logging to $UPGRADE_LOG_FILE"
 }
 
-critical_flog() {
-	critical_log "$1" "$LOG_FILE"
+# Call this function every time a new script is run
+set_script_name_and_log_file() {
+	SCRIPT_NAME="$(basename "$1")"
+	LOG_FILE="/dev/null"
+
+	for name in "${UPGRADE_SUPPORT_SCRIPT_NAMES[@]}"
+	do
+		if [ "$name" == "$SCRIPT_NAME" ]; then
+			LOG_FILE="$UPGRADE_LOG_FILE"
+			break
+		fi
+	done
 }
 
-#------------------------------------------------
-#       log msg [file]
-#------------------------------------------------
 log() {
 	# log format: [script_name][tag]actual_log
 	LOG="[${SCRIPT_NAME}]$1"
-	if [ "$2" != "" ]; then
-		echo "[$(date +"%d/%m/%Y %H:%M:%S")]" "$LOG" >> "$2"
+	LOG_DATE="[$(date +"%d/%m/%Y %H:%M:%S")]"
+
+	if [ $# -ge 2 ] && [ "$2" == "critical" ]; then
+		dlogsend -k "$LOG"
 	fi
-	echo "$LOG"
 
-	return 0
+	echo "$LOG_DATE" "$LOG" | tee -a "$LOG_FILE"
 }
 
-flog() {
-	log "$1" "$LOG_FILE"
+critical_log() {
+	log "$1" "critical"
 }
 
 untrap() {
@@ -67,21 +78,21 @@ retrap() {
 	trap 'echo "Aborting due to errexit on ${0##*/}:$LINENO. Exit code: $?" >&2' ERR
 }
 
-verify_file() {
+verify_file_internal() {
 	FILE_NAME="$1"
 	FILE_PATH="$FOTA_DIR/$FILE_NAME"
 	VALID_CHECKSUM=$(awk "\$2 ~ /^$FILE_NAME\$/ {print \$1}" "$FOTA_DIR/checksum.SHA1")
 	if [ "$VALID_CHECKSUM" == "" ]; then
-		echo "[Error] No $FILE_NAME in checksum.SHA1"
+		log "[Error] No $FILE_NAME in checksum.SHA1"
 		return $FALSE
 	fi
 
 	if ! echo "$VALID_CHECKSUM  $FILE_PATH" | sha1sum --check --status; then
-		echo "[Error] Checksum for file $FILE_NAME is invalid"
+		log "[Error] Checksum for file $FILE_NAME is invalid"
 		return $FALSE
 	fi
 
-	echo "[Info] Checksum of $FILE_NAME is OK"
+	log "[Info] Checksum of $FILE_NAME is OK"
 	return $TRUE
 }
 
@@ -90,10 +101,10 @@ unpack_file() {
 	FILE_NAME="$2"
 	tar xpf "${ARCHIVE_NAME}" -C "${FOTA_DIR}" "${FILE_NAME}" 2> /dev/null
 	if [ ! -e "${FOTA_DIR}/${FILE_NAME}" ]; then
-		flog "[Error] There is no ${FILE_NAME}"
+		log "[Error] There is no ${FILE_NAME}"
 	fi
 
-	if ! verify_file "$FILE_NAME"; then
+	if ! verify_file_internal "$FILE_NAME"; then
 		exit_error
 	fi
 }
@@ -101,13 +112,13 @@ unpack_file() {
 verify_img() {
 	DELTA_FILE="$1"
 	if [ -e "$IMG_VERIFIER" ]; then
-		log "[Info] Package verifier is found. Verify $DELTA_FILE" "$LOG_FILE"
+		log "[Info] Package verifier is found. Verify $DELTA_FILE"
 		if ! "$IMG_VERIFIER" -i "$DELTA_FILE" -l "/opt/var/log/last_iv.log"; then
-			log "[Error] Update package verification FAILED..." "$LOG_FILE"
+			log "[Error] Update package verification FAILED..."
 			echo 5 > "$STATUS_DIR"/result
 			exit_error
 		else
-			log "[Info] Update package verification PASSED!" "$LOG_FILE"
+			log "[Info] Update package verification PASSED!"
 		fi
 	fi
 }
@@ -160,13 +171,13 @@ map_from_super() {
         echo "/dev/mapper/$part_name"
         return 0
     else
-        echo "WARNING : SUPER FOUND BUT $part_name NOT FOUND" >&2
+        log "[Warning] : SUPER FOUND BUT $part_name NOT FOUND"
         return 1
     fi
 }
 
 check_if_super() {
-	if SUPERFS="$("$BLKID_PRINT" "$EMMC_DEVICE" super a)"; then
+	if SUPERFS="$(("$BLKID_PRINT" "$EMMC_DEVICE" super a) 2>/dev/null)"; then
 		local MAPPED_DEVICES=""
 		MAPPED_DEVICES=$(dmsetup ls)
 
@@ -217,7 +228,7 @@ check_used_block_device() {
 
 	if ! EMMC_DEVICE="/dev/$(/bin/lsblk -ndo pkname "${ROOTFS_DEVICE}")" ||\
 		[ "$EMMC_DEVICE" == "/dev/" ]; then
-		flog "[Error] Unable to find used block device: $EMMC_DEVICE, for /"
+		log "[Error] Unable to find used block device: $EMMC_DEVICE, for /"
 		exit_error
 	fi
 
@@ -225,20 +236,20 @@ check_used_block_device() {
 }
 
 background_copy() {
-	flog "[Info] Background copying A|B partitions for update..."
+	log "[Info] Background copying A|B partitions for update..."
 	start_duration=$(date +%s)
 	for partition_name in ${PARTITION_LIST}; do
 		if { [ "$partition_name" == "rootfs" ] || [ "$partition_name" == "hal" ]; } && [ -n "$SUPERFS" ]; then
 			if { [ "$partition_name" == "rootfs" ] && (( ROOTFS_CURR_SIZE == 0 )); } || \
 				{ [ "$partition_name" == "hal" ] && (( HAL_CURR_SIZE == 0 )); }; then
-				flog "[Error] Unable to find: $partition_name current partition on $EMMC_DEVICE device on $CURRENT_AB slot"
+				log "[Error] Unable to find: $partition_name current partition on $EMMC_DEVICE device on $CURRENT_AB slot"
 				check_optional_partition "$partition_name" 1
 				continue
 			fi
 
 			if { [ "$partition_name" == "rootfs" ] && (( ROOTFS_NEXT_SIZE == 0 )); } || \
 				{ [ "$partition_name" == "hal" ] && (( HAL_NEXT_SIZE == 0 )); }; then
-				flog "[Error] Unable to find: $partition_name next partition on $EMMC_DEVICE device on $NEXT_AB slot"
+				log "[Error] Unable to find: $partition_name next partition on $EMMC_DEVICE device on $NEXT_AB slot"
 				check_optional_partition "$partition_name" 1
 				continue
 			fi
@@ -247,26 +258,26 @@ background_copy() {
 			NEXT_PARTITION="/dev/mapper/${partition_name}_${NEXT_AB}"
 		else
 			if ! CURRENT_PARTITION="$("$BLKID_PRINT" "$EMMC_DEVICE" "$partition_name" "$CURRENT_AB")"; then
-				flog "[Error] Unable to find: $partition_name current partition on $EMMC_DEVICE device on $CURRENT_AB slot"
+				log "[Error] Unable to find: $partition_name current partition on $EMMC_DEVICE device on $CURRENT_AB slot"
 				check_optional_partition "$partition_name" 1
 				continue
 			fi
 
 			if ! NEXT_PARTITION="$("$BLKID_PRINT" "$EMMC_DEVICE" "$partition_name" "$NEXT_AB")"; then
-				flog "[Error] Unable to find: $partition_name next partition on $EMMC_DEVICE device on $NEXT_AB slot"
+				log "[Error] Unable to find: $partition_name next partition on $EMMC_DEVICE device on $NEXT_AB slot"
 				check_optional_partition "$partition_name" 1
 				continue
 			fi
 		fi
 		if [ "$CURRENT_PARTITION" == "" ] || [ "$NEXT_PARTITION" == "" ]; then
-			flog "[Error] current: $CURRENT_PARTITION or next: $NEXT_PARTITION partition is empty on $EMMC_DEVICE device"
+			log "[Error] current: $CURRENT_PARTITION or next: $NEXT_PARTITION partition is empty on $EMMC_DEVICE device"
 			return $FALSE
 		fi
 		if [ "$CURRENT_PARTITION" == "$NEXT_PARTITION" ]; then
-			flog "[Info] $partition_name partition current and next are the same: $CURRENT_PARTITION on $EMMC_DEVICE device"
+			log "[Info] $partition_name partition current and next are the same: $CURRENT_PARTITION on $EMMC_DEVICE device"
 			continue
 		fi
-		flog "[Info] Background copy $partition_name, from: $CURRENT_PARTITION to $NEXT_PARTITION"
+		log "[Info] Background copy $partition_name, from: $CURRENT_PARTITION to $NEXT_PARTITION"
 		if [ -n "$SUPERFS" ] && { [ "$partition_name" == "rootfs" ] || [ "$partition_name" == "hal" ]; }; then
 			if [ "$partition_name" == "rootfs" ]; then
 				if (( ROOTFS_NEXT_SIZE < ROOTFS_CURR_SIZE )); then
@@ -286,10 +297,10 @@ background_copy() {
 		else
 			/bin/dd if="$CURRENT_PARTITION" of="$NEXT_PARTITION" bs=4096
 		fi
-		flog "[Info] Finished background copy $partition_name from $CURRENT_PARTITION to $NEXT_PARTITION"
+		log "[Info] Finished background copy $partition_name from $CURRENT_PARTITION to $NEXT_PARTITION"
 
 		if [ "$partition_name" == "rootfs" ]; then
-			flog "[Info] Checksum verification for $partition_name"
+			log "[Info] Checksum verification for $partition_name"
 			if [ -n "$SUPERFS" ]; then
 				if (( ROOTFS_NEXT_SIZE < ROOTFS_CURR_SIZE )); then
 					CUR_SHA1=$(head -c "$ROOTFS_NEXT_SIZE" "$CURRENT_PARTITION" | sha1sum | awk '{print $1}')
@@ -304,16 +315,16 @@ background_copy() {
 			fi
 
 			if [ "$CUR_SHA1" == "$NEXT_SHA1" ]; then
-				flog "[Info] Partition $partition_name was cloned correctly"
+				log "[Info] Partition $partition_name was cloned correctly"
 			else
-				flog "[Error] Checksums are different: $CUR_SHA1 != $NEXT_SHA1"
+				log "[Error] Checksums are different: $CUR_SHA1 != $NEXT_SHA1"
 				exit_error
 			fi
 		fi
 	done
 	end_duration=$(date +%s)
 	totaltime=$((end_duration - start_duration))
-	flog "[Info] Finished Background copying A|B partitions for update...Total Time : $totaltime sec"
+	log "[Info] Finished Background copying A|B partitions for update...Total Time : $totaltime sec"
 	return $TRUE
 }
 
@@ -323,7 +334,7 @@ load_background_copy_list() {
 
 upgrade_images() {
 	DELTA_TAR="$1"
-	flog "[Info] Flash images for update..."
+	log "[Info] Flash images for update..."
 
 	LABEL_MAP_PATH=${HAL_UPGRADE_CFG_DIR}/${HAL_}
 	while read LABEL PARTLABEL; do
@@ -350,7 +361,7 @@ upgrade_images() {
 		fi
 
 		if ! /bin/tar tf "$DELTA_TAR" "$DELTA_NAME"; then
-			flog "[Error] There is no delta $DELTA_NAME for label $LABEL_NAME from part $PART_NAME"
+			log "[Error] There is no delta $DELTA_NAME for label $LABEL_NAME from part $PART_NAME"
 			exit_error
 		fi
 
@@ -365,7 +376,7 @@ upgrade_images() {
 			CURR_PARTITION="$("$BLKID_PRINT" "$EMMC_DEVICE" "$PART_NAME" "$CURRENT_AB")"
 		fi
 
-		flog "[Info] Flashing $DELTA_NAME... to $NEXT_PARTITION"
+		log "[Info] Flashing $DELTA_NAME... to $NEXT_PARTITION"
 
 		local UP_RES
 		untrap
@@ -401,10 +412,10 @@ upgrade_images() {
 		retrap
 		case $UP_RES in
 			0)
-				flog "[Info] Finished flashing $DELTA_NAME... to $NEXT_PARTITION"
+				log "[Info] Finished flashing $DELTA_NAME... to $NEXT_PARTITION"
 				;;
 			*)
-				flog "[Info] Flashing error $DELTA_NAME... to $NEXT_PARTITION"
+				log "[Info] Flashing error $DELTA_NAME... to $NEXT_PARTITION"
 				return $FALSE
 				;;
 		esac
@@ -417,7 +428,7 @@ run_setup_script() {
 	SETUP_SCRIPT_PATH=$FOTA_DIR/$SETUP_SCRIPT_NAME
 
 	/bin/tar xvfp "$DELTA_TAR" -C "$FOTA_DIR" "$SETUP_SCRIPT_NAME" 2>/dev/null ||\
-		(log "[Info] setup.sh does not exist, skipping." "$LOG_FILE" && return)
+		(log "[Info] setup.sh does not exist, skipping." && return)
 
 	if [ -e "$SETUP_SCRIPT_PATH" ]; then
 		/bin/sh "$SETUP_SCRIPT_PATH"
@@ -445,38 +456,16 @@ write_version_info() {
 
 set_upgrade_status() {
 	VALUE="$1"
-	${SET_UPGRADE_STATUS} ${VALUE}
+	${SET_UPGRADE_STATUS} ${VALUE} &>/dev/null
 	if [ $? -eq 0 ]; then
-		critical_log "set_upgrade_status success: ${VALUE}" "$LOG_FILE"
+		critical_log "[Info] set_upgrade_status success: status is ${VALUE}"
 	else
-		critical_log "set_upgrade_status failed: ${VALUE}" "$LOG_FILE"
+		critical_log "[Info] set_upgrade_status failed: status is ${VALUE}"
 	fi
 }
 
 exit_error() {
 	set_upgrade_status -1
-	LOG_DIR="/var/log/fota"
-
-	if [ ! -d "$LOG_DIR" ]; then
-		/usr/bin/mkdir -p "$LOG_DIR"
-	fi
-
-	if [ -e /tmp/upgrade-prepare-partitions.log ]; then
-		/usr/bin/mv /tmp/upgrade-prepare-partitions.log $LOG_DIR/
-	fi
-
-	if [ -e /tmp/upgrade-trigger.log ]; then
-		/usr/bin/mv /tmp/upgrade-trigger.log $LOG_DIR/
-	fi
-
-	if [ -e /tmp/upgrade-partial.log ]; then
-		/usr/bin/mv /tmp/upgrade-partial.log $LOG_DIR/
-	fi
-
-	if [ -e /tmp/update-fota.log ]; then
-		/usr/bin/mv /tmp/update-fota.log $LOG_DIR/
-	fi
-
 	exit 1
 }
 
@@ -486,7 +475,7 @@ mount_partition() {
 	local MOUNT_OPTIONS="$3"
 	local SRC
 	if ! SRC="$("$BLKID_PRINT" "$EMMC_DEVICE" "$GPT_LABEL" "$NEXT_AB")"; then
-		flog "[Error] Unable to find $GPT_LABEL partition on $EMMC_DEVICE device for $NEXT_AB slot"
+		log "[Error] Unable to find $GPT_LABEL partition on $EMMC_DEVICE device for $NEXT_AB slot"
 		return 1
 	fi
 	local MOUNTED="$(/bin/findmnt -n -o TARGET "$SRC" | /bin/head -n 1 || echo "")"
@@ -495,11 +484,11 @@ mount_partition() {
 		SRC="$MOUNTED"
 	fi
 	if ! /bin/mkdir -p "$DST"; then
-		flog "[Error] Unable to mkdir for mount destination: $DST"
+		log "[Error] Unable to mkdir for mount destination: $DST"
 		return 1
 	fi
 	if ! /bin/mount -o "$MOUNT_OPTIONS" "$SRC" "$DST"; then
-		flog "[Error] Unable to mount $SRC to $DST, options: $MOUNT_OPTIONS"
+		log "[Error] Unable to mount $SRC to $DST, options: $MOUNT_OPTIONS"
 		return 1
 	fi
 	CLEANUP_PARTITION+=("$DST")
@@ -511,11 +500,11 @@ cleanup_partitions() {
 	for (( idx=${#CLEANUP_PARTITION[@]}-1 ; idx>=0 ; idx-- )) ; do
 		local DST="${CLEANUP_PARTITION[idx]}"
 		if [ "$DST" == "" ]; then
-			flog "[Error] Partition for cleanup is empty, idx: $idx, partition count: ${#CLEANUP_PARTITION[@]}"
+			log "[Error] Partition for cleanup is empty, idx: $idx, partition count: ${#CLEANUP_PARTITION[@]}"
 			continue
 		fi
 		if ! /bin/umount "$DST"; then
-			flog "[Error] Unable to umount $DST"
+			log "[Error] Unable to umount $DST"
 		fi
 
 	done
diff --git a/scripts/upgrade-support/upgrade-fota.sh b/scripts/upgrade-support/upgrade-fota.sh
index 89f55ab..ac21c34 100755
--- a/scripts/upgrade-support/upgrade-fota.sh
+++ b/scripts/upgrade-support/upgrade-fota.sh
@@ -12,13 +12,11 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 FOTA_DIR="/opt/usr/data/fota"
 
 . "$FOTA_DIR"/upgrade-common.inc
+set_script_name_and_log_file "${BASH_SOURCE[0]}"
 
 FOTA_UPDATE_PREFIX="/run/upgrade-sysroot"
 VERSION_FILE="$FOTA_UPDATE_PREFIX/opt/etc/version"
 
-SCRIPT_NAME="upgrade-fota.sh"
-LOG_FILE="/tmp/update-fota.log"
-
 cleanup() {
 	cleanup_partitions
 	cleanup_files
@@ -38,32 +36,32 @@ mount() {
 	mkdir -p "$FOTA_UPDATE_PREFIX/opt"
 
 	if ! mount_partition system-data "$FOTA_UPDATE_PREFIX/opt" "rw"; then
-		critical_flog "[Error] Unable to mount opt"
+		critical_log "[Error] Unable to mount opt"
 		return 1
 	fi
 	return 0
 }
 
 reboot_to_fota() {
-	flog "[Info] Write paths..."
+	log "[Info] Write paths..."
 	touch "$DO_RW_UPDATE_FILE"
-	flog "[Info] calling sync"
+	log "[Info] calling sync"
 
-	flog "[Info] Switching board partition from $CURRENT_AB, to $NEXT_AB"
+	log "[Info] Switching board partition from $CURRENT_AB, to $NEXT_AB"
 	if ! device_board_switch_partition $NEXT_AB; then
-		critical_flog "[Error] Failed to switch board slot to $NEXT_AB"
+		critical_log "[Error] Failed to switch board slot to $NEXT_AB"
 		exit 1
 	fi
 	cleanup_files
 	/bin/sync
-	flog "[Info] Rebooting to fota"
+	log "[Info] Rebooting to fota"
 
 	# System will reboot, so the script will be aborted. We don't want this to be
 	# treated as an error.
 	set -u errexit
 	untrap
 	if ! /sbin/reboot fota; then
-		critical_flog "[Error] Failed to reboot fota"
+		critical_log "[Error] Failed to reboot fota"
 		exit 1
 	fi
 }
@@ -84,7 +82,7 @@ if ! write_version_info "$VERSION_FILE"; then
 	exit 1
 fi
 
-critical_log "RO update: $SCRIPT_NAME success" "$LOG_FILE"
+critical_log "[Info] RO update: $SCRIPT_NAME success"
 
 if ! reboot_to_fota; then
 	cleanup
diff --git a/scripts/upgrade-support/upgrade-partial.sh b/scripts/upgrade-support/upgrade-partial.sh
index fd99b2a..71ef97b 100755
--- a/scripts/upgrade-support/upgrade-partial.sh
+++ b/scripts/upgrade-support/upgrade-partial.sh
@@ -11,18 +11,16 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 FOTA_DIR="/opt/usr/data/fota"
 
 . "$FOTA_DIR"/upgrade-common.inc
-
-SCRIPT_NAME="upgrade-partial.sh"
-LOG_FILE="/tmp/upgrade-partial.log"
+set_script_name_and_log_file "${BASH_SOURCE[0]}"
 
 check_args() {
 	DELTA_TAR="$1"
 	if [ ! -f "$DELTA_TAR" ]; then
-		flog "[Error] Usage: $0 path_to_delta.tar[.gz]"
+		log "[Error] Usage: $0 path_to_delta.tar[.gz]"
 		exit 1
 	fi
 
-	flog "[Info] Using <$DELTA_TAR> delta file."
+	log "[Info] Using <$DELTA_TAR> delta file."
 }
 
 FOTA_UPDATE_PREFIX="/run/upgrade-sysroot"
@@ -51,17 +49,17 @@ unpack_file "$DELTA_TAR" "upgrade-apply"
 unpack_file "$DELTA_TAR" "upgrade-apply-deltafs"
 /bin/chmod +x "$FOTA_DIR/upgrade-apply-deltafs"
 if ! upgrade_images "$DELTA_TAR"; then
-	critical_flog "[Error] Unable to upgrade_images"
+	critical_log "[Error] Unable to upgrade_images"
 	cleanup
 	exit_error
 fi
 
 if ! run_setup_script "$DELTA_TAR"; then
-	critical_flog "[Error] Unable to run_setup_script"
+	critical_log "[Error] Unable to run_setup_script"
 	cleanup
 	exit_error
 fi
 
 cleanup
 
-critical_log "RO update: $SCRIPT_NAME success" "$LOG_FILE"
+critical_log "[Info] RO update: $SCRIPT_NAME success"
diff --git a/scripts/upgrade-support/upgrade-prepare-partitions.sh b/scripts/upgrade-support/upgrade-prepare-partitions.sh
index 1c23c8a..e40ad94 100755
--- a/scripts/upgrade-support/upgrade-prepare-partitions.sh
+++ b/scripts/upgrade-support/upgrade-prepare-partitions.sh
@@ -12,9 +12,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 FOTA_DIR="/opt/usr/data/fota"
 
 . "$FOTA_DIR"/upgrade-common.inc
-
-SCRIPT_NAME="upgrade-prepare-partitions.sh"
-LOG_FILE="/tmp/upgrade-prepare-partitions.log"
+set_script_name_and_log_file "${BASH_SOURCE[0]}"
 
 check_optional_partition() {
 	partition_name="$1"
@@ -41,4 +39,4 @@ if ! background_copy; then
 fi
 cleanup_files
 
-critical_log "RO update preparation: $SCRIPT_NAME success" "$LOG_FILE"
+critical_log "[Info] RO update preparation: $SCRIPT_NAME success"
diff --git a/scripts/upgrade-support/upgrade-trigger.sh b/scripts/upgrade-support/upgrade-trigger.sh
index fa1e783..98c96a2 100644
--- a/scripts/upgrade-support/upgrade-trigger.sh
+++ b/scripts/upgrade-support/upgrade-trigger.sh
@@ -12,15 +12,12 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 FOTA_DIR="/opt/usr/data/fota"
 STATUS_DIR="/opt/data/update"
 DOWNLOAD_DELTA="$1"
-SCRIPT_NAME="upgrade-trigger.sh"
-LOG_FILE="/tmp/upgrade-trigger.log"
 SCRIPT_UPGRADE_PREPARE_PARTITIONS="upgrade-prepare-partitions.sh"
 SCRIPT_UPGRADE_PARTIAL="upgrade-partial.sh"
 SCRIPT_UPGRADE_FOTA="upgrade-fota.sh"
 BLKID_PRINT_FILE="blkid-print"
 RESIZE_DYNPARTS_FILE="resize-dynparts"
 FLOCK_PATH="/var/lock/clone_partitions.lock"
-DELTA_VERIFIER="/usr/bin/delta-verifier"
 export BLKID_PRINT="$FOTA_DIR/$BLKID_PRINT_FILE"
 export RESIZE_DYNPARTS="$FOTA_DIR/$RESIZE_DYNPARTS_FILE"
 
@@ -35,28 +32,18 @@ prepare_fota_dir() {
 			# If provided delta is from outside the FOTA_DIR delete everything
 			rm -rf -- "$FOTA_DIR/*"
 		fi
+	# `echo` commands below are intentional as upgrade-common.inc is not sourced yet (no access to logging functions)
 	else
-		log "[Info] Create fota dir..." "$LOG_FILE"
+		echo "[Info] Create fota dir..."
 		mkdir -p "$FOTA_DIR"
 	fi
 
 	if [ ! -d "$STATUS_DIR" ]; then
-		log "[Info] Create status dir..." "$LOG_FILE"
+		echo "[Info] Create status dir..."
 		mkdir -p "$STATUS_DIR"
 	fi
 }
 
-log() {
-	# log format: [script_name][tag]actual_log
-	LOG="[${SCRIPT_NAME}]$1"
-	if [ "$2" != "" ]; then
-		echo "[$(date +"%d/%m/%Y %H:%M:%S")]" "$LOG" >> "$2"
-	fi
-	echo "$LOG"
-
-	return 0
-}
-
 is_ab_upgrade() {
 	if grep -q partition_ab= /proc/cmdline; then
 		return $TRUE
@@ -64,6 +51,12 @@ is_ab_upgrade() {
 	return $FALSE
 }
 
+run_script() {
+	log "[Info] Running $1"
+	$1
+	RET=$?
+}
+
 do_update() {
 	if is_ab_upgrade; then
 		set_upgrade_status 5
@@ -77,14 +70,16 @@ do_update() {
 		unpack_file "$DOWNLOAD_DELTA" "$CONFIG_FILE"
 
 		if [ "$(device_board_get_partition_ab_cloned)" -eq 0 ]; then
-			log "Starting to prepare the partitions for upgrade.." "$LOG_FILE"
+			log "[Info] Starting to prepare the partitions for upgrade.."
 
 			unpack_file "${DOWNLOAD_DELTA}" "${SCRIPT_UPGRADE_PREPARE_PARTITIONS}"
-			if ! "${FOTA_DIR}/${SCRIPT_UPGRADE_PREPARE_PARTITIONS}"; then
+
+			run_script "${FOTA_DIR}/${SCRIPT_UPGRADE_PREPARE_PARTITIONS}"
+			if [ $RET -ne 0 ]; then
 				exit_error
 			fi
 		else
-			echo "[Info] Partitions already cloned"
+			log "[Info] Partitions already cloned"
 		fi
 
 		set_upgrade_status 20
@@ -96,8 +91,10 @@ do_update() {
 		unpack_file "${DOWNLOAD_DELTA}" "${SCRIPT_UPGRADE_PARTIAL}"
 		unpack_file "${DOWNLOAD_DELTA}" "${SCRIPT_UPGRADE_FOTA}"
 
-		if ! "${FOTA_DIR}/${SCRIPT_UPGRADE_PARTIAL}" "${DOWNLOAD_DELTA}"; then
-			log "[Error] Failed to run $SCRIPT_UPGRADE_PARTIAL ${DOWNLOAD_DELTA}"
+		run_script ""${FOTA_DIR}/${SCRIPT_UPGRADE_PARTIAL}" "${DOWNLOAD_DELTA}""
+
+		if [ $RET -ne 0 ] ; then
+			log "[Error] Failed to run $SCRIPT_UPGRADE_PARTIAL ${DOWNLOAD_DELTA}" "$LOG_FILE"
 			exit_error
 		fi
 
@@ -107,7 +104,8 @@ do_update() {
 		# script will be aborted. We don't want this to be treated as an error.
 		untrap
 		set -u errexit
-		if ! "${FOTA_DIR}/${SCRIPT_UPGRADE_FOTA}"; then
+		run_script "${FOTA_DIR}/${SCRIPT_UPGRADE_FOTA}"
+		if ! [ $RET -ne 0 ]; then
 			# We want to check if we are here becasue the reboot interrupted the
 			# execution of ${SCRIPT_UPGRADE_FOTA} or for some other reason.
 			# If a reboot is currently in progress then /proc/1/exe will point to
@@ -117,12 +115,12 @@ do_update() {
 				exit_error
 			else
 				set_upgrade_status 80
-				echo "[Info] RO update: $SCRIPT_NAME success"
+				log "[Info] RO update: $SCRIPT_NAME success"
 			fi
 		fi
 
 	else
-		echo "[Error] Non-A/B upgrade is unsupported"
+		log "[Error] Non-A/B upgrade is unsupported"
 		device_board_set_upgrade_status -1
 		exit 1
 	fi
@@ -134,38 +132,41 @@ verify_file() {
 
 	VALID_CHECKSUM=$(awk "\$2 ~ /^$FILE_NAME\$/ {print \$1}" "$FOTA_DIR/checksum.SHA1")
 	if [ "$VALID_CHECKSUM" == "" ]; then
-		echo "[Error] No $FILE_NAME in checksum.SHA1"
+		log "[Error] No $FILE_NAME in checksum.SHA1"
 		device_board_set_upgrade_status -1
 		exit 1
 	fi
 
 	if ! echo "$VALID_CHECKSUM  $FILE_PATH" | sha1sum --check --status; then
-		echo "[Error] Checksum for file $FILE_NAME is invalid"
+		log "[Error] Checksum for file $FILE_NAME is invalid"
 		device_board_set_upgrade_status -1
 		exit 1
 	fi
 
-	echo "[Info] Checksum of $FILE_NAME is OK"
+	log "[Info] Checksum of $FILE_NAME is OK"
 }
 
 (
 flock 9
 
-rm -f "$LOG_FILE" && touch "$LOG_FILE"
-
 if [ "$#" != "1" ] || [ ! -f "$1" ]; then
-	log "[Error] Usage: $0 path_to_delta.tar[.gz]" "$LOG_FILE"
+	echo "[Error] Usage: $0 path_to_delta.tar[.gz]"
 	exit 1
 fi
 
-log "[Info] Triggered upgrade.." "$LOG_FILE"
-log "[Info] Using <$DOWNLOAD_DELTA> delta file." "$LOG_FILE"
-
 prepare_fota_dir
+
 tar xfp "$DOWNLOAD_DELTA" -C "$FOTA_DIR" checksum.SHA1
-verify_file "$0"
+
 tar xfp "$DOWNLOAD_DELTA" -C "$FOTA_DIR" upgrade-common.inc
+
+. "$FOTA_DIR"/upgrade-common.inc
+upgrade_log_init
+set_script_name_and_log_file "${BASH_SOURCE[0]}"
+
 verify_file "$FOTA_DIR/upgrade-common.inc"
+
+verify_file "$0"
 tar xfp "$DOWNLOAD_DELTA" -C "$FOTA_DIR" update-info.ini
 verify_file "$FOTA_DIR/update-info.ini"
 tar xfp "$DOWNLOAD_DELTA" -C "$FOTA_DIR" delta-verifier
@@ -183,8 +184,6 @@ if [ ${RET} -ne 0 ]; then
 fi
 log "[Info] Delta verification success"
 
-. "$FOTA_DIR"/upgrade-common.inc
-
 set_upgrade_status 1
 verify_img "${DOWNLOAD_DELTA}"
 do_update