diff --git a/ChangeLog b/ChangeLog index 0d03c0932..ac15610b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-06-09 Vladimir Serbinenko + + * tests/grub_script_expansion.in: Explicitly tell grep that we handle + text and not binary. + 2012-06-09 Vladimir Serbinenko 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 . -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