From: Kyle Russell <bkylerussell@gmail.com>
Date: Wed, 19 Feb 2014 18:30:32 +0000 (-0500)
Subject: image-vmdk.bbclass: Don't force syslinux timeout
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be98ee879fe3d558be31cc8102dd3c8de3e22405;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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

Don't force SYSLINUX_TIMEOUT and SYSLINUX_PROMPT if overrides have
been defined elsewhere for an image configuration.

(From OE-Core rev: a6522c19af9525a6e0bed241f2d926faaef76827)

Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass
index 6a98f17b9dd..fac5f718336 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} "