summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-bsp/grub/grub-1.99/40_custom2
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh1
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh8
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
5# the 'exec tail' line above. 5# the 'exec tail' line above.
6menuentry "Linux" { 6menuentry "Linux" {
7 set root=(hd0,1) 7 set root=(hd0,1)
8 linux /boot/vmlinuz root=__ROOTFS__ rw __VIDEO_MODE__ __VGA_MODE__ quiet 8 linux /boot/vmlinuz root=__ROOTFS__ rw __CONSOLE__ __VIDEO_MODE__ __VGA_MODE__ quiet
9} 9}
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
156 sed -i "s@__ROOTFS__@$rootfs $rootwait@g" /ssd/etc/grub.d/40_custom 156 sed -i "s@__ROOTFS__@$rootfs $rootwait@g" /ssd/etc/grub.d/40_custom
157 sed -i "s/__VIDEO_MODE__/$3/g" /ssd/etc/grub.d/40_custom 157 sed -i "s/__VIDEO_MODE__/$3/g" /ssd/etc/grub.d/40_custom
158 sed -i "s/__VGA_MODE__/$4/g" /ssd/etc/grub.d/40_custom 158 sed -i "s/__VGA_MODE__/$4/g" /ssd/etc/grub.d/40_custom
159 sed -i "s/__CONSOLE__/$5/g" /ssd/etc/grub.d/40_custom
159 mount $bootfs /bootmnt 160 mount $bootfs /bootmnt
160 cp /ssd/etc/grub.d/40_custom /bootmnt/40_custom 161 cp /ssd/etc/grub.d/40_custom /bootmnt/40_custom
161 umount /bootmnt 162 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() {
38 video_mode=$arg ;; 38 video_mode=$arg ;;
39 vga=*) 39 vga=*)
40 vga_mode=$arg ;; 40 vga_mode=$arg ;;
41 console=*)
42 if [ -z "${console_params}" ]; then
43 console_params=$arg
44 else
45 console_params="$console_params $arg"
46 fi
41 esac 47 esac
42 done 48 done
43} 49}
@@ -112,7 +118,7 @@ case $label in
112 ;; 118 ;;
113 install) 119 install)
114 if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then 120 if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then
115 ./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode 121 ./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params
116 else 122 else
117 fatal "Could not find install script" 123 fatal "Could not find install script"
118 fi 124 fi