Fix quiet mode

We only need to output initlog messages if output occurs on /dev/console. Fixes: f70ac4c ("Remove initlog") Signed-off-by: Alexey Gladkov <[email protected]>
osboot · Apr 17, 2024 · d1be1ae · d1be1ae
1 parent 6c85778
commit d1be1ae
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/data/etc/rc.d/init.d/functions b/data/etc/rc.d/init.d/functions
@@ -442,10 +442,11 @@ echo_passed()
 # Log that something succeeded
 success()
 {
-	[ -z "${INITLOG_FILE-}" ] ||
-		message "$1 succeeded" >"$INITLOG_FILE"
-	[ "${RDLOG-}" != 'console' ] ||
+	if [ "${RDLOG-}" = 'console' ]; then
+		[ -z "${INITLOG_FILE-}" ] ||
+			message "$1 succeeded" >"$INITLOG_FILE"
 		return 0
+	fi
 	echo_success
 	echo_newline
 	return 0
@@ -455,10 +456,11 @@ success()
 failure()
 {
 	local rc=$?
-	[ -z "${INITLOG_FILE-}" ] ||
-		message "$1 failed" >"$INITLOG_FILE"
-	[ "${RDLOG-}" != 'console' ] ||
+	if [ "${RDLOG-}" = 'console' ]; then
+		[ -z "${INITLOG_FILE-}" ] ||
+			message "$1 failed" >"$INITLOG_FILE"
 		return $rc
+	fi
 	echo_failure
 	echo_newline
 	return $rc
@@ -468,10 +470,11 @@ failure()
 passed()
 {
 	local rc=$?
-	[ -z "${INITLOG_FILE-}" ] ||
-		message "$1 passed" >"$INITLOG_FILE"
-	[ "${RDLOG-}" != 'console' ] ||
+	if [ "${RDLOG-}" = 'console' ]; then
+		[ -z "${INITLOG_FILE-}" ] ||
+			message "$1 passed" >"$INITLOG_FILE"
 		return $rc
+	fi
 	echo_passed
 	echo_newline
 	return $rc