aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Russell <bkylerussell@gmail.com>2014-02-19 13:30:32 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-20 14:28:05 +0000
commita6522c19af9525a6e0bed241f2d926faaef76827 (patch)
tree0c53f6ab928e1535a5f828d59342c1feef591ced
parent935abb7f867944dd4f169469045771d0600bbbd2 (diff)
downloadopenembedded-core-contrib-a6522c19af9525a6e0bed241f2d926faaef76827.tar.gz
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@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/classes/image-vmdk.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass
index 6a98f17b9d..fac5f71833 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} "