Skip to contentSkip to conversation

grub-shell: Trim line should always be matched from the beginning of the line.

PATCH In review Glenn Washburn 1 participant 1 message Aug 17, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 4/7 grub-shell: Trim line should always be matched from the beginning of the line.

---
 tests/util/grub-shell.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/util/grub-shell.in +2 -2
index b409962f1..602b16f3e 100644
@@ -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
Signature · 1 line
2.25.1