From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 9 Jun 2012 17:58:38 +0000 (+0200)
Subject: 	* tests/grub_script_expansion.in: Explicitly tell grep that we handle
X-Git-Tag: 2.00~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5561c22d59967e423df4eccdcf5114d4287e8ef1;p=thirdparty%2Fgrub.git

	* tests/grub_script_expansion.in: Explicitly tell grep that we handle
	text and not binary.
---

diff --git a/ChangeLog b/ChangeLog
index 0d03c0932..ac15610b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* tests/grub_script_expansion.in: Explicitly tell grep that we handle
+	text and not binary.
+
 2012-06-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Stop polling as soon as we have the packet we were waiting for.
diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in
index 45bfcc5e7..c4763907c 100644
--- a/tests/grub_script_expansion.in
+++ b/tests/grub_script_expansion.in
@@ -17,7 +17,7 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-disks=`echo ls | @builddir@/grub-shell| grep -v '^Network protocols:$'| grep -v '^tftp http $'`
+disks=`echo ls | @builddir@/grub-shell| grep -av '^Network protocols:$'| grep -av '^tftp http $'`
 other=`echo insmod regexp\; echo \* | @builddir@/grub-shell`
 for d in $disks; do
     if echo "$d" |grep ',' >/dev/null; then