[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 02/15] grub-shell: Trim line should always be matched from the
From: |
Glenn Washburn |
Subject: |
[PATCH v3 02/15] grub-shell: Trim line should always be matched from the beginning of the line |
Date: |
Thu, 10 Feb 2022 15:51:19 -0600 |
When turning on shell tracing the trim line will be output before we
actually want to start the trim. However, in this case the trim line never
starts from the beginning of the line. So start trimming from the correct
line by matching from the beginning of the line.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/util/grub-shell.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index b409962f1..602b16f3e 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -343,7 +343,7 @@ terminal_output ${term}
EOF
if [ $trim = 1 ]; then
- echo "echo $trim_head" >>${cfgfile}
+ echo "echo; echo $trim_head" >>${cfgfile}
fi
rom_directory=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
@@ -457,7 +457,7 @@ fi
do_trim ()
{
if [ $trim = 1 ] || [ $trim = 2 ]; then
- awk '{ if (have_head == 1) print $0; } /'"$trim_head"'/ { have_head=1;
}'
+ awk '{ if (have_head == 1) print $0; } /^'"$trim_head"'/ { have_head=1;
}'
else
cat
fi
--
2.27.0
- [PATCH v3 00/15] Grub-shell improvements, Glenn Washburn, 2022/02/10
- [PATCH v3 01/15] grub-shell: Allow specifying non-default trim line contents, Glenn Washburn, 2022/02/10
- [PATCH v3 02/15] grub-shell: Trim line should always be matched from the beginning of the line,
Glenn Washburn <=
- [PATCH v3 03/15] grub-shell: Only show grub-mkrescue output if it returns an error, Glenn Washburn, 2022/02/10
- [PATCH v3 04/15] grub-shell: Allow setting default timeout via GRUB_SHELL_DEFAULT_TIMEOUT envvar, Glenn Washburn, 2022/02/10
- [PATCH v3 05/15] grub-shell: Put all generated files into working dir and use better file names, Glenn Washburn, 2022/02/10
- [PATCH v3 06/15] grub-shell: Add grub output logfile with grub-shell --debug, Glenn Washburn, 2022/02/10
- [PATCH v3 07/15] grub-shell: Set exit status to qemu exit status, Glenn Washburn, 2022/02/10
- [PATCH v3 08/15] grub-shell: Only cleanup working directory file if QEMU does not fail or timeout, Glenn Washburn, 2022/02/10
- [PATCH v3 09/15] grub-shell: Create run.sh in working directory for easily running test again, Glenn Washburn, 2022/02/10
- [PATCH v3 10/15] grub-shell: Add $GRUB_QEMU_OPTS to run.sh to easily see unofficial QEMU arguments, Glenn Washburn, 2022/02/10
- [PATCH v3 11/15] tests: Allow turning on shell tracing from environment variables, Glenn Washburn, 2022/02/10
- [PATCH v3 12/15] grub-shell: Add --verbose to mkrescue when $debug is greater than 2, Glenn Washburn, 2022/02/10