sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Add console kernel options 

Live image installer did not preserve BSP specified console= kernel parameter.
This patch updates the init scripts that are responsible for grub.cfg creation
so that options like console= are passed allong from installer to installed img

[YOCTO #2426]

(From OE-Core rev: e18c59eb5a61f265b9cad6de68359fa1430b0e58)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Radu Moisan 2012-07-19 14:59:52 +03:00 committed by Richard Purdie
parent 99ed56ff38
commit 807ff46bc9
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-bsp/grub/grub-1.99/40_custom
View File

@ -5,5 +5,5 @@ exec tail -n +3 $0
# the 'exec tail' line above.
menuentry "Linux" {
set root=(hd0,1)
linux /boot/vmlinuz root=__ROOTFS__ rw __VIDEO_MODE__ __VGA_MODE__ quiet
linux /boot/vmlinuz root=__ROOTFS__ rw __CONSOLE__ __VIDEO_MODE__ __VGA_MODE__ quiet
}

1
meta/recipes-core/initrdscripts/files/init-install.sh
View File

@ -156,6 +156,7 @@ if [ -f /ssd/etc/grub.d/40_custom ] ; then
sed -i "s@__ROOTFS__@$rootfs $rootwait@g" /ssd/etc/grub.d/40_custom
sed -i "s/__VIDEO_MODE__/$3/g" /ssd/etc/grub.d/40_custom
sed -i "s/__VGA_MODE__/$4/g" /ssd/etc/grub.d/40_custom
sed -i "s/__CONSOLE__/$5/g" /ssd/etc/grub.d/40_custom
mount $bootfs /bootmnt
cp /ssd/etc/grub.d/40_custom /bootmnt/40_custom
umount /bootmnt

8
meta/recipes-core/initrdscripts/files/init-live.sh
View File

@ -38,6 +38,12 @@ read_args() {
video_mode=$arg ;;
vga=*)
vga_mode=$arg ;;
console=*)
if [ -z "${console_params}" ]; then
console_params=$arg
else
console_params="$console_params $arg"
fi
esac
done
}
@ -112,7 +118,7 @@ case $label in
;;
install)
if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then
./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode
./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params
else
fatal "Could not find install script"
fi