Adjust logging

msm-cros-efs-loader.sh

@@ -6,24 +6,13 @@ RMTFS_DIR=/var/lib/rmtfs
 RMTFS_BOOT_DIR="${RMTFS_DIR}/boot"
 FSG_PATH="${RMTFS_BOOT_DIR}/modem_fsg"
 FSG_SOURCE="$(echo /dev/mmcblk*boot0)"
-# Logging messages go directly to /dev/kmsg because we run before
-# syslog is available.
-logit() {
-	echo "<6>${JOB}:" "$@" > /dev/kmsg
-}
-logwarn() {
-	echo "<4>${JOB}:" "$@" > /dev/kmsg
-}
-logerr() {
-	echo "<3>${JOB}:" "$@" > /dev/kmsg
-}
 # Read the FSG fuse hash, and store the result into
 # fsg_fuse_hash.
 read_fuses() {
 	fuse_path="$(realpath /sys/bus/nvmem/devices/qfprom*/nvmem)"
 	fsg_fuse_hash=
 	if [ ! -r "${fuse_path}" ]; then
-		logerr "Fuse driver does not appear to be loaded."
+		echo "ERROR: Fuse driver does not appear to be loaded."
 		return 1
 	fi
 	fsg_fuse_hash="$(dd if="${fuse_path}" bs=1 skip=$((0x750)) count=32 \
@@ -73,7 +62,7 @@ reload_fsg() {
 		fsg_size="$(dd if="${FSG_SOURCE}" bs=1 skip=4 count=8 status=none)"
 	# If the header area is just blank, save an extra read and just bail now.
 	elif [ -z "${fsg_header}" ]; then
-		logit "Blank eMMC boot partition."
+		echo "INFO: Blank eMMC boot partition."
 		return 1
 	else
 		# Ordinarily this would be the place to error out. For this next
@@ -82,12 +71,12 @@ reload_fsg() {
 	fi
 	# Wifi-only SKUs will land here the first time through.
 	if [ "${fsg_size}" -eq 0 ]; then
-		logit "No LTE FSG found."
+		echo "INFO: No LTE FSG found."
 		return 1
 	fi
-	logit "Reloading FSG"
+	echo "INFO: Reloading FSG"
 	if [ "${fsg_size}" -gt 4193792 ]; then
-		logwarn "Warning: FSG size invalid. LTE will not work."
+		echo "WARNING: FSG size invalid. LTE will not work."
 	fi
 	mkdir -p "${RMTFS_BOOT_DIR}"
 	chmod 0700 "${RMTFS_BOOT_DIR}" "${RMTFS_DIR}"
@@ -98,7 +87,7 @@ reload_fsg() {
 	if ! dd if="${FSG_SOURCE}" of="${fsg_tmp_path}" bs=1M \
 				iflag=count_bytes,skip_bytes count="${fsg_size}" \
 				skip=512 status=none; then
-		logerr "Error: Failed to read FSG."
+		echo "ERROR: Failed to read FSG."
 		return 1
 	fi
 	# Sync to ensure the temporary file is fully written to disk. Then
@@ -120,7 +109,7 @@ verify_fsg() {
 		# For WiFi SKUs, the first factory run, or for certain pre-production
 		# devices), the FSG hash is not set. Allow it to continue with the FSG
 		# tarball pre-populated in the boot partition.
-		logit "Fuses are unprogrammed."
+		echo "INFO: Fuses are unprogrammed."
 		# If the FSG already exists no need to copy it again; bail out.
 		if [ -f "${FSG_PATH}" ]; then
 			return
@@ -141,18 +130,18 @@ verify_fsg() {
 	elif [ "${retval}" -ne 2 ]; then
 		# Allow a hash mismatch in dev/test images.
 		if crossystem "cros_debug?1" ; then
-			logwarn "FSG hash check failed, forgiven in developer mode."
+			echo "WARNING: FSG hash check failed, forgiven in developer mode."
 		# For other errors, blank out the FSG in case the eMMC boot partition
 		# was compromised.
 		else
-			logerr "FSG hash check failed. LTE will not work"
+			echo "ERROR: FSG hash check failed. LTE will not work"
 			rm -f "${FSG_PATH}"
 		fi
 	fi
 }
 main() {
 	if [ "$#" -ne 0 ]; then
-		logerr "$0: Expected no arguments."
+		echo "ERROR: $0: Expected no arguments."
 		exit 1
 	fi
 	verify_fsg