Changeset 29786


Ignore:
Timestamp:
2012-01-19T02:14:45+01:00 (6 years ago)
Author:
jow
Message:

Make the grub timeout configurable on x86 targets

Signed-off-by: Justus Winter <4winter@…>

Location:
trunk/target/linux/x86/image
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/x86/image/Config.in

    r28518 r29786  
    4848          If you don't know, just leave it blank. 
    4949 
     50config X86_GRUB_TIMEOUT 
     51        string "Seconds to wait before booting the default entry" 
     52        depends X86_GRUB_IMAGES 
     53        default "5" 
     54        help 
     55          If you don't know, 5 seconds is a reasonable default. 
     56 
    5057config X86_VDI_IMAGES 
    5158        bool "Build VirtualBox image files (VDI)" 
  • trunk/target/linux/x86/image/Makefile

    r26919 r29786  
    3131 
    3232ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) 
     33 
     34GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_X86_GRUB_TIMEOUT)) 
    3335 
    3436ifneq ($(CONFIG_X86_GRUB_IMAGES),) 
     
    6567                -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ 
    6668                -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ 
     69                -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ 
    6770                ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst 
    6871        PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh \ 
  • trunk/target/linux/x86/image/menu.lst

    r19681 r29786  
    33 
    44default 0 
    5 timeout 5 
     5timeout @TIMEOUT@ 
    66 
    77title   OpenWrt 
Note: See TracChangeset for help on using the changeset viewer.