vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-mkconfig_lib.in (print_option_help): Properly redirect

Browse source 
stderr on test calls.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-27 13:14:42 +02:00
parent 8b43f587ae
commit d336f65225
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-27 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkconfig_lib.in (print_option_help): Properly redirect
stderr on test calls.
2012-05-27 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/jfs.c (grub_jfs_find_file): Handle "." and "..". * grub-core/fs/jfs.c (grub_jfs_find_file): Handle "." and "..".

6
util/grub-mkconfig_lib.in
View file

@ -290,16 +290,16 @@ uses_abstraction () {
print_option_help () { print_option_help () {
if test x$print_option_help_wc = x; then if test x$print_option_help_wc = x; then
if wc -L < /dev/null > /dev/null; then if wc -L </dev/null > /dev/null 2>&1; then
print_option_help_wc=-L print_option_help_wc=-L
elif wc -m < /dev/null > /dev/null; then elif wc -m </dev/null > /dev/null 2>&1; then
print_option_help_wc=-m print_option_help_wc=-m
else else
print_option_help_wc=-b print_option_help_wc=-b
fi fi
fi fi
if test x$grub_have_fmt = x; then if test x$grub_have_fmt = x; then
if fmt -w 40 < /dev/null > /dev/null; then if fmt -w 40 </dev/null > /dev/null 2>&1; then
grub_have_fmt=y; grub_have_fmt=y;
else else
grub_have_fmt=n; grub_have_fmt=n;