From 9abf6bc2c96f56f61d52d221b5c8823acdd41767 Mon Sep 17 00:00:00 2001
From: marcel <marcel@FreeBSD.org>
Date: Mon, 22 Sep 2014 15:27:23 +0000
Subject: Don't echo '# $FreeBSD$' as the first line into the .uu file. 
 Keyword substitution applies to this file, including the echo command. Avoid
 the match (and substitution) by breaking the string up into 3 parts.

---
 usr.bin/mkimg/tests/mkimg.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr.bin/mkimg/tests/mkimg.sh b/usr.bin/mkimg/tests/mkimg.sh
index 5482ad6..00b5d92 100755
--- a/usr.bin/mkimg/tests/mkimg.sh
+++ b/usr.bin/mkimg/tests/mkimg.sh
@@ -91,7 +91,8 @@ mkimg_test()
     hexdump -C $image > $result
     baseline=`atf_get_srcdir`/$image
     if test "x$mkimg_update_baseline" = "xyes"; then
-	echo '# $FreeBSD$' > $image.gz.uu
+	# Prevent keyword expansion when writing the keyword.
+	(echo -n '# $'; echo -n FreeBSD; echo '$') > $image.gz.uu
 	gzip -c $result | uuencode $image.gz >> $image.gz.uu
 	rm $image $result _tmp-*
     else
-- 
cgit v1.1