tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests/util/grub-shell: Trim line should always be matched from the beginning of the line

Browse Source 
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>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Glenn Washburn 2023-01-10 16:08:58 -06:00 committed by Daniel Kiper
parent 8e8e443997
commit f38d1b4c75
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/util/grub-shell.in
View File

@ -357,7 +357,7 @@ terminal_output ${term}
EOF
if [ $trim = 1 ]; then
echo "echo $trim_head" >>${cfgfile}
echo "echo; echo $trim_head" >>${cfgfile}
fi
rom_directory="$work_directory/rom_directory"
@ -481,7 +481,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