[oe-commits] Kyle Russell : image-vmdk.bbclass: Don't force syslinux timeout

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: a6522c19af9525a6e0bed241f2d926faaef76827
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a6522c19af9525a6e0bed241f2d926faaef76827

Author: Kyle Russell <bkylerussell at gmail.com>
Date:   Wed Feb 19 13:30:32 2014 -0500

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.

Signed-off-by: Kyle Russell <bkylerussell at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/image-vmdk.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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