summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorCatalin Enache <catalin.enache@windriver.com>2018-05-30 17:04:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-04 15:14:59 +0100
commitcaffc3770906a5ab700504d64b59a5ab1017e056 (patch)
tree305e24ff9b7c472fd3b1402ca6c77fb8cd8450bb /meta/recipes-core
parent1afce9d00f23b366e284f5ca574049aef7c33b88 (diff)
downloadpoky-caffc3770906a5ab700504d64b59a5ab1017e056.tar.gz
init-install: add timeout for legacy grub
After installing an image from an iso, booting the system using the legacy boots makes the grub prompt wait for an enter. This is not desirable since many of this devices are embedded devices that should start by them self without user entry. (From OE-Core rev: f6d85426e48d458d0835d4fd3314ce53ab92bd38) Signed-off-by: Catalin Enache <catalin.enache@windriver.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.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 28e8f09d19..e71579631b 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -302,6 +302,8 @@ if [ -f /etc/grub.d/00_header -a $grub_version -ne 0 ] ; then
302 GRUBCFG="/boot/grub/grub.cfg" 302 GRUBCFG="/boot/grub/grub.cfg"
303 mkdir -p $(dirname $GRUBCFG) 303 mkdir -p $(dirname $GRUBCFG)
304 cat >$GRUBCFG <<_EOF 304 cat >$GRUBCFG <<_EOF
305timeout=5
306default=0
305menuentry "Linux" { 307menuentry "Linux" {
306 search --no-floppy --fs-uuid $boot_uuid --set root 308 search --no-floppy --fs-uuid $boot_uuid --set root
307 linux /$kernel root=PARTUUID=$root_part_uuid $rootwait rw $5 $3 $4 quiet 309 linux /$kernel root=PARTUUID=$root_part_uuid $rootwait rw $5 $3 $4 quiet