grub-devel
[Top][All Lists]
Advanced

[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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]