]> code.ossystems Code Review - openembedded-core.git/commit
initramfs-live-install: avoid using grub.d/40_custom
authorRobert Yang <liezhi.yang@windriver.com>
Tue, 20 May 2014 02:49:47 +0000 (10:49 +0800)
committerSaul Wold <sgw@linux.intel.com>
Fri, 23 May 2014 17:35:48 +0000 (10:35 -0700)
commit8ae89d08454c11035eb2826a06e2243c9f2568b4
tree52ca7d8a8fdfc796662a0719d4585eeaeb2fc03f
parent87fd1d7331f6f64a9037d97672dbe66d93f276de
initramfs-live-install: avoid using grub.d/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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-core/initrdscripts/files/init-install.sh