diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-19 10:49:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-19 10:49:49 +0200 |
commit | 7907e3ee7302ac3fd428989a07b0df74f0c52853 (patch) | |
tree | e6de18488a687707667927065724372b40510d65 /package/grub/patches/patch-util_grub_d_10_linux_in | |
parent | b70fdbfbf1139605c22083b647337f2b16f62fc3 (diff) | |
parent | 61355d1f054c15673adeb62d32dfd4563f89c165 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/grub/patches/patch-util_grub_d_10_linux_in')
-rw-r--r-- | package/grub/patches/patch-util_grub_d_10_linux_in | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/package/grub/patches/patch-util_grub_d_10_linux_in b/package/grub/patches/patch-util_grub_d_10_linux_in new file mode 100644 index 000000000..b84b3e3ca --- /dev/null +++ b/package/grub/patches/patch-util_grub_d_10_linux_in @@ -0,0 +1,20 @@ +--- grub-1.98.orig/util/grub.d/10_linux.in 2010-03-06 21:51:37.000000000 +0100 ++++ grub-1.98/util/grub.d/10_linux.in 2010-06-26 21:18:10.803156350 +0200 +@@ -66,8 +66,8 @@ linux_entry () + # Use ELILO's generic "efifb" when it's known to be available. + # FIXME: We need an interface to select vesafb in case efifb can't be used. + if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then +- if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null \ +- && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" /boot/config-${version} 2> /dev/null; then ++ if grep -q "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null \ ++ && grep -q "CONFIG_VT_HW_CONSOLE_BINDING=y" /boot/config-${version} 2> /dev/null; then + cat << EOF + set gfxpayload=keep + EOF +@@ -135,5 +135,5 @@ while [ "x$list" != "x" ] ; do + "single ${GRUB_CMDLINE_LINUX}" + fi + +- list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` ++ list=`echo $list | tr ' ' '\n' | grep -v $linux | tr '\n' ' '` + done |