]> code.ossystems Code Review - openembedded-core.git/commit
grub-2.00: remove our 40_custom
authorRoy Li <rongqing.li@windriver.com>
Fri, 6 Jun 2014 08:26:26 +0000 (16:26 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 6 Jun 2014 09:21:20 +0000 (10:21 +0100)
commite5f6dc48930c8ff35df5cff3550ec2ee86641faf
treefc84f956a0d7efa82ab18bc69ec99be79bc6e4b1
parent4fad24fef5552bd0e4a5ea0982573ba8e4523570
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.

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>
meta/recipes-core/initrdscripts/files/init-install-testfs.sh