From 8ae89d08454c11035eb2826a06e2243c9f2568b4 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 20 May 2014 10:49:47 +0800 Subject: 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 Signed-off-by: Saul Wold --- meta/recipes-core/initrdscripts/files/init-install.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'meta/recipes-core/initrdscripts') diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index b1600030f5..f84a5eb83b 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -168,17 +168,16 @@ umount /src_root # Handling of the target boot partition mount $bootfs /boot echo "Preparing boot partition..." -if [ -f /etc/grub.d/40_custom ] ; then +if [ -f /etc/grub.d/00_header ] ; then echo "Preparing custom grub2 menu..." GRUBCFG="/boot/grub/grub.cfg" mkdir -p $(dirname $GRUBCFG) - cp /etc/grub.d/40_custom $GRUBCFG - sed -i "s@__ROOTFS__@$rootfs $rootwait@g" $GRUBCFG - sed -i "s/__VIDEO_MODE__/$3/g" $GRUBCFG - sed -i "s/__VGA_MODE__/$4/g" $GRUBCFG - sed -i "s/__CONSOLE__/$5/g" $GRUBCFG - sed -i "/#/d" $GRUBCFG - sed -i "/exec tail/d" $GRUBCFG + cat >$GRUBCFG <<_EOF +menuentry "Linux" { + set root=(hd0,1) + linux /vmlinuz root=$rootfs $rootwait rw $5 $3 $4 quiet +} +_EOF chmod 0444 $GRUBCFG fi grub-install /dev/${device} -- cgit v1.2.3