Patchwork image-vmdk.bbclass: Don't force syslinux timeout

login
register
mail settings
Submitter Kyle Russell
Date Feb. 19, 2014, 6:30 p.m.
Message ID <1392834632-2867-1-git-send-email-bkylerussell@gmail.com>
Download mbox | patch
Permalink /patch/67007/
State New
Headers show

Comments

Kyle Russell - Feb. 19, 2014, 6:30 p.m.
Don't force SYSLINUX_TIMEOUT and SYSLINUX_PROMPT if overrides have
been defined elsewhere for an image configuration.

Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
---
 meta/classes/image-vmdk.bbclass |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass
index 6983e5c..bdb9e18 100644
--- a/meta/classes/image-vmdk.bbclass
+++ b/meta/classes/image-vmdk.bbclass
@@ -2,8 +2,8 @@ 
 #NOISO = "1"
 
 SYSLINUX_ROOT = "root=/dev/hda2 "
-SYSLINUX_PROMPT = "0"
-SYSLINUX_TIMEOUT = "1"
+SYSLINUX_PROMPT ?= "0"
+SYSLINUX_TIMEOUT ?= "1"
 SYSLINUX_LABELS = "boot"
 LABELS_append = " ${SYSLINUX_LABELS} "