From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1k7Sef-0007cB-6Q for mharc-grub-devel@gnu.org; Sun, 16 Aug 2020 20:05:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7Sed-0007Zw-JS for grub-devel@gnu.org; Sun, 16 Aug 2020 20:05:35 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:39622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7Seb-00064C-WD for grub-devel@gnu.org; Sun, 16 Aug 2020 20:05:35 -0400 Received: by mail-pf1-x436.google.com with SMTP id u128so7350306pfb.6 for ; Sun, 16 Aug 2020 17:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XP42Wd/HNMAYowXdNXzPVK5NKkKOyaQjHfdxzuPWtPE=; b=jJOOjgmBISOyx45narWdm/krlvpsTW1mTpf4djKwDyaAZmtx1g/xZ6VL6vTe9ufm61 ohRVSjK2RE96M1RJro33VkYoXPdrUykxSrkG/ORjQtDc2ig/x03bv8jlUT0dfM5PNo/D DVzGc9PUc/U/dnKwDI1SvqJ6YJLdIxQve01JMNLB1kqEdo1yQddmAe40Cxo8KBMHJKEQ 8uY/p4LWSV7wap7F4WH8pc10UJHRgnbNwPufW3ukSj4Yhg6gyF2hQUq3M+TKgzLx3TrE AWsli8XEGDYFi2yUy1Ep8+wjZRw33qm7UE6HeVQYm8naqrczN6H3tu6J/DMStr468X/q 9svg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XP42Wd/HNMAYowXdNXzPVK5NKkKOyaQjHfdxzuPWtPE=; b=HQml5u/hzHaBopsOdTSw86x3u2H1LoWrwIlC+YCz59N3zSqVkdC9kT6X78hCaZgJjE mhpfrqyM8T+KCqxCXu5uh/Kip/OUns6ISd7xLoGJ7ch2J49sMUn/NbOzjeggONcXwjo6 MD803lgSN6Ej1zqjoPWuLibfA88FqtS13DbTAOURzalTC1YcPyMoQP/eNhfRKZrfIfrx AYHqOe/h/DoV2NVin82pPcrXk1yIW4fwHTdDNdJuNE8m2bYKn69bRcie5SPON0NmeItI l+MAuMAwnqnqV/K7gGpSDIwj6Twaxbk56U2hW+fIOUTvKsnSJxCSBmLZidF1/xJj+uAv 2mVQ== X-Gm-Message-State: AOAM530JQ/hK5zPPskMmpd7xhCEVrk3ud14GY8Pmm7XKMt0uv6LAw0G3 GKt2nqZz8M1lJxrGynG4BbIMwLYWteZnAA== X-Google-Smtp-Source: ABdhPJyvuGLK4qPpXMvsu4JmoKzA3sm3SJFfBzJeBxO7LcvUovIFsOqktp5atrUzQVp0lJHEsRwVBQ== X-Received: by 2002:a63:d048:: with SMTP id s8mr8081757pgi.171.1597622732327; Sun, 16 Aug 2020 17:05:32 -0700 (PDT) Received: from crass-HP-ZBook-15-G2.lan ([136.49.44.103]) by smtp.gmail.com with ESMTPSA id h19sm14967000pjv.41.2020.08.16.17.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Aug 2020 17:05:31 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Glenn Washburn Subject: [CRYPTOMOUNT-TEST 4/7] grub-shell: Trim line should always be matched from the beginning of the line. Date: Sun, 16 Aug 2020 19:05:15 -0500 Message-Id: <20200817000518.4006518-5-development@efficientek.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=development@efficientek.com; helo=mail-pf1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2020 00:05:35 -0000 Signed-off-by: Glenn Washburn --- 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.25.1