1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index b8f21cb7a5..504725d266 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -1,9 +1,8 @@
 INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
 INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
-SYSLINUX_ROOT_LIVE ?= "root=/dev/ram0"
+ROOT_LIVE ?= "root=/dev/ram0"
-SYSLINUX_LABELS_LIVE ?= "boot install"
+LABELS_LIVE ?= "boot install"
-LABELS_LIVE ?= "${SYSLINUX_LABELS_LIVE}"
 SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg"
 ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index b8f21cb7a5..504725d266 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass
@@ -1,9 +1,8 @@
1		1
2	INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"	2	INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
3	INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"	3	INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
4	SYSLINUX_ROOT_LIVE ?= "root=/dev/ram0"	4	ROOT_LIVE ?= "root=/dev/ram0"
5	SYSLINUX_LABELS_LIVE ?= "boot install"	5	LABELS_LIVE ?= "boot install"
6	LABELS_LIVE ?= "${SYSLINUX_LABELS_LIVE}"
7	SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg"	6	SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg"
8		7
9	ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"	8	ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"