diff options
| -rwxr-xr-x | meta/recipes-bsp/grub/grub-1.99/40_custom | 2 | ||||
| -rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 1 | ||||
| -rw-r--r-- | 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 0d80854778..ba488308b6 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 0ac4949355..c1f8cba5d3 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 737dae4cbc..d5e241a620 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 |