summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2012-07-19 14:59:52 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-19 17:18:10 +0100
commit807ff46bc9d94106a11a58621994cc15e80f6d14 (patch)
tree3ad71ce6e1c4f74939a270e7d751a2026b1b106f /meta/recipes-core
parent99ed56ff38bb8ffac849c059905578e11df8f037 (diff)
downloadast2050-yocto-poky-807ff46bc9d94106a11a58621994cc15e80f6d14.zip
ast2050-yocto-poky-807ff46bc9d94106a11a58621994cc15e80f6d14.tar.gz
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh1
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh8
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 0ac4949..c1f8cba 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -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
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 737dae4..d5e241a 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -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
OpenPOWER on IntegriCloud