summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub/grub
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2014-06-06 16:26:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-06 10:24:07 +0100
commitec53bfd18c4e5d92ec4baedd702248a303a15dfa (patch)
tree07a2748fe945a0fe1be3449a8532c9b6b33be00e /meta/recipes-bsp/grub/grub
parent5a49a24d35794fcf9e3895469a67db992a52305e (diff)
downloadpoky-ec53bfd18c4e5d92ec4baedd702248a303a15dfa.tar.gz
grub-2.00: remove our 40_custom
We have this in recipes-bsp/grub/grub/40_custom: [snip] menuentry "Linux" { set root=(hd0,1) linux /vmlinuz root=__ROOTFS__ rw __CONSOLE__ __VIDEO_MODE__ __VGA_MODE__ quiet } [snip] These lines are only for initrdscripts/files/init-install.sh, the side effect is that it would make the target's grub-mkconfig doesn't work well since the 40_custom will be installed to /etc/grub.d/40_custom, the grub-mkconfig will run the 40_custom, and there will always be a 'menuentry "Linux"' menu in grub.cfg no matter it is valid or not, we can do this in init-install.sh rather than grub to fix the problem, which is also much simpler. We have done the related work in init-install.sh, now we need remove our own 40_custom, and use grub's own 40_custom which is the right one. (From OE-Core rev: 4fad24fef5552bd0e4a5ea0982573ba8e4523570) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/grub')
-rwxr-xr-xmeta/recipes-bsp/grub/grub/40_custom9
1 files changed, 0 insertions, 9 deletions
diff --git a/meta/recipes-bsp/grub/grub/40_custom b/meta/recipes-bsp/grub/grub/40_custom
deleted file mode 100755
index f891b02779..0000000000
--- a/meta/recipes-bsp/grub/grub/40_custom
+++ /dev/null
@@ -1,9 +0,0 @@
1#!/bin/sh
2exec tail -n +3 $0
3# This file provides an easy way to add custom menu entries. Simply type the
4# menu entries you want to add after this comment. Be careful not to change
5# the 'exec tail' line above.
6menuentry "Linux" {
7 set root=(hd0,1)
8 linux /vmlinuz root=__ROOTFS__ rw __CONSOLE__ __VIDEO_MODE__ __VGA_MODE__ quiet
9}