diff options
Diffstat (limited to 'meta/classes/image-live.bbclass')
| -rw-r--r-- | meta/classes/image-live.bbclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index badf40de54..b8f21cb7a5 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -1,10 +1,10 @@ -INITRD_IMAGE ?= "core-image-minimal-initramfs" -INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz" -SYSLINUX_ROOT ?= "root=/dev/ram0" -SYSLINUX_TIMEOUT ?= "50" -SYSLINUX_LABELS ?= "boot install" -LABELS_append = " ${SYSLINUX_LABELS} " +INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs" +INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz" +SYSLINUX_ROOT_LIVE ?= "root=/dev/ram0" +SYSLINUX_LABELS_LIVE ?= "boot install" +LABELS_LIVE ?= "${SYSLINUX_LABELS_LIVE}" +SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" @@ -19,9 +19,9 @@ IMAGE_TYPES_MASKED += "live hddimg iso" python() { image_b = d.getVar('IMAGE_BASENAME', True) - initrd_i = d.getVar('INITRD_IMAGE', True) + initrd_i = d.getVar('INITRD_IMAGE_LIVE', True) if image_b == initrd_i: - bb.error('INITRD_IMAGE %s cannot use image live, hddimg or iso.' % initrd_i) + bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i) bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.') else: d.appendVarFlag('do_bootimg', 'depends', ' %s:do_image_complete' % initrd_i) |