From: Radu Moisan <radu.moisan@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] Add console kernel options
Date: Thu, 19 Jul 2012 14:59:52 +0300 [thread overview]
Message-ID: <1342699192-14294-1-git-send-email-radu.moisan@intel.com> (raw)
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]
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
meta/recipes-bsp/grub/grub-1.99/40_custom | 2 +-
.../initrdscripts/files/init-install.sh | 1 +
meta/recipes-core/initrdscripts/files/init-live.sh | 8 +++++++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/grub/grub-1.99/40_custom b/meta/recipes-bsp/grub/grub-1.99/40_custom
index 0d80854..ba48830 100755
--- a/meta/recipes-bsp/grub/grub-1.99/40_custom
+++ b/meta/recipes-bsp/grub/grub-1.99/40_custom
@@ -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
}
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
--
1.7.9.5
next reply other threads:[~2012-07-19 12:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-19 11:59 Radu Moisan [this message]
2012-07-20 3:58 ` [PATCH] Add console kernel options Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342699192-14294-1-git-send-email-radu.moisan@intel.com \
--to=radu.moisan@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox