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

Avoid == in test command, it's not portable.

Browse source
This commit is contained in:
Grégoire Sutre 2010-07-05 00:45:14 +02:00
parent cb7f64b229
commit 57ebd41ef1
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-07-04 Grégoire Sutre <gregoire.sutre@gmail.com>
* configure.ac: Avoid == in test command, it's not portable.
* util/grub.d/30_os-prober.in: Likewise.
2010-07-04 Colin Watson <cjwatson@ubuntu.com> 2010-07-04 Colin Watson <cjwatson@ubuntu.com>
* kern/emu/getroot.c [__GNU__]: Include <sys/mman.h> for munmap. * kern/emu/getroot.c [__GNU__]: Include <sys/mman.h> for munmap.

2
configure.ac
View file

@ -190,7 +190,7 @@ for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
done done
done done
if test "x$FONT_SOURCE" == x && ( test "x$platform" = xqemu || test "x$platform" = xyeeloong ); then if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xyeeloong ); then
AC_MSG_ERROR([qemu and yeeloong ports need unifont]) AC_MSG_ERROR([qemu and yeeloong ports need unifont])
fi fi

2
util/grub.d/30_os-prober.in
View file

@ -52,7 +52,7 @@ EOF
set do_resume=1 set do_resume=1
fi fi
fi fi
if [ \$do_resume == 0 ]; then if [ \$do_resume = 0 ]; then
xnu_uuid ${OSXUUID} uuid xnu_uuid ${OSXUUID} uuid
if [ -f /Extra/DSDT.aml ]; then if [ -f /Extra/DSDT.aml ]; then
acpi -e /Extra/DSDT.aml acpi -e /Extra/DSDT.aml