From 1284230ad554f8607cb02b054fdd74017ae7c861 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 21 Feb 2012 14:48:16 -0800 Subject: boot-directdisk: Use correct SYSLINUX_TIMEOUT and SYSLINUX_ROOT instead of APPEND Signed-off-by: Saul Wold --- meta/classes/boot-directdisk.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index 8879ba8ebf..893164f853 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass @@ -38,8 +38,9 @@ BOOTDD_EXTRA_SPACE ?= "16384" AUTO_SYSLINUXCFG = "1" LABELS = "boot" -APPEND = "root=/dev/sda2" -TIMEOUT = "10" +SYSLINUX_ROOT ?= "root=/dev/sda2" +SYSLINUX_TIMEOUT = "10" # 1 second + SYSLINUXCFG = "${HDDDIR}/syslinux.cfg" SYSLINUXMENU = "${HDDDIR}/menu" @@ -50,6 +51,7 @@ build_boot_dd() { install -d ${HDDDIR} install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${HDDDIR}/vmlinuz + install -m 0644 ${S}/syslinux.cfg ${HDDDIR}/syslinux.cfg install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys BLOCKS=`du -bks ${HDDDIR} | cut -f 1` -- cgit 1.2.3-korg