[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/12] grub-shell: Trim line should always be matched from the be
From: |
Glenn Washburn |
Subject: |
[PATCH 02/12] grub-shell: Trim line should always be matched from the beginning of the line |
Date: |
Wed, 31 Mar 2021 20:57:41 -0500 |
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 00/12] Grub-shell improvements, Glenn Washburn, 2021/03/31
- [PATCH 01/12] grub-shell: Allow specifying non-default trim line contents, Glenn Washburn, 2021/03/31
- [PATCH 02/12] grub-shell: Trim line should always be matched from the beginning of the line,
Glenn Washburn <=
- [PATCH 05/12] grub-shell: Put all generated files into working dir and use better file names, Glenn Washburn, 2021/03/31
- [PATCH 08/12] tests: Allow turning on shell tracing from environment variables, Glenn Washburn, 2021/03/31
- [PATCH 07/12] grub-shell: Set exit status to qemu exit status, Glenn Washburn, 2021/03/31
- [PATCH 04/12] grub-shell: Allow setting default timeout via GRUB_SHELL_DEFAULT_TIMEOUT envvar, Glenn Washburn, 2021/03/31
- [PATCH 11/12] grub-shell: Use malta qemu-mips machine type instead off non-existant indy, Glenn Washburn, 2021/03/31
- [PATCH 12/12] grub-shell: Update qemu UEFI firmware names to be more generic, Glenn Washburn, 2021/03/31
- [PATCH 06/12] grub-shell: Add grub output logfile with grub-shell --debug, Glenn Washburn, 2021/03/31
- [PATCH 03/12] grub-shell: Only show grub-mkrescue output if it returns an error, Glenn Washburn, 2021/03/31
- [PATCH 10/12] grub-shell: Only turn on qemu head when large debug value is specified, Glenn Washburn, 2021/03/31
- [PATCH 09/12] grub-shell: Add --verbose to mkrescue when $debug is greater than 2, Glenn Washburn, 2021/03/31