* tests/grub_script_expansion.in: Explicitly tell grep that we handle

	text and not binary.

diff --git a/ChangeLog b/ChangeLog
index 0d03c0932e884a8db03e9941ab298a99ef1eb10a..ac15610b1263dd78796c0ef04363d2b9e1ce8771 100644 (file)
--- 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 45bfcc5e7c354fba7c4be167c3e66c18efb42a70..c4763907c7536a369f2b004a437fa13b86ef0fe6 100644 (file)
--- 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