Skip to content

Commit c41c923

Browse files
committed
init: clarify origin of quiet mode once more after merge conflict resolution
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 727bbe1 commit c41c923

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

initrd/init

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ if [ "$CONFIG_QUIET_MODE" = "y" ]; then
108108
# check origin of quiet mode setting =y: if it is under /etc/config.user then early cbfs-init outputs are not suppressible
109109
# if it is under /etc/config then early cbfs-init outputs are suppressible
110110
if grep -q 'CONFIG_QUIET_MODE="y"' /etc/config 2>/dev/null; then
111-
echo "Quiet mode enabled: refer to '/tmp/debug.log' for boot measurements traces" >/dev/tty0
111+
echo "Quiet mode enabled from board configuration: refer to '/tmp/debug.log' for boot measurements traces" >/dev/tty0
112112
else
113-
echo "Runtime Quiet mode: refer to '/tmp/debug.log' for additional boot measurements traces past this point" >/dev/tty0
113+
echo "Runtime applied Quiet mode: refer to '/tmp/debug.log' for additional boot measurements traces past this point" >/dev/tty0
114114
echo "To suppress earlier boot measurements traces, enable CONFIG_QUIET_MODE=y in your board configuration at build time." >/dev/tty0
115115
fi
116116
# If CONFIG_QUIET_MODE enabled in board config but disabled from Config->Configuration Settings
@@ -120,7 +120,7 @@ elif [ "$CONFIG_QUIET_MODE" = "n" ]; then
120120
# both needs to be checked to determine if early boot measurements traces were suppressed
121121
if grep -q 'CONFIG_QUIET_MODE="y"' /etc/config 2>/dev/null && grep -q 'CONFIG_QUIET_MODE="n"' /etc/config.user 2>/dev/null; then
122122
echo "Early boot measurements traces were suppressed per CONFIG_QUIET_MODE=y in your board configuration at build time (/etc/config)" >/dev/tty0
123-
echo "Runtime Quiet mode disabled: refer to '/tmp/debug.log' for cbfs-init related traces prior of this point" >/dev/tty0
123+
echo "Runtime applied Quiet mode disabled: refer to '/tmp/debug.log' for cbfs-init related traces prior of this point" >/dev/tty0
124124
fi
125125
fi
126126

0 commit comments

Comments
 (0)