summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/boot-directdisk.bbclass12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index ce637b89d7..89007e315b 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -62,8 +62,6 @@ DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
62SYSLINUX_ROOT ?= "root=/dev/sda2" 62SYSLINUX_ROOT ?= "root=/dev/sda2"
63SYSLINUX_TIMEOUT ?= "10" 63SYSLINUX_TIMEOUT ?= "10"
64 64
65IS_VM = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2"], "true", "false", d)}'
66
67boot_direct_populate() { 65boot_direct_populate() {
68 dest=$1 66 dest=$1
69 install -d $dest 67 install -d $dest
@@ -102,12 +100,10 @@ build_boot_dd() {
102 efi_hddimg_populate $HDDDIR 100 efi_hddimg_populate $HDDDIR
103 fi 101 fi
104 102
105 if [ "${IS_VM}" = "true" ]; then 103 if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then
106 if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then 104 install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 $HDDDIR/${SYSLINUXDIR}/
107 install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 $HDDDIR/${SYSLINUXDIR}/ 105 if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then
108 if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then 106 install -m 0644 ${SYSLINUX_SPLASH} $HDDDIR/${SYSLINUXDIR}/splash.lss
109 install -m 0644 ${SYSLINUX_SPLASH} $HDDDIR/${SYSLINUXDIR}/splash.lss
110 fi
111 fi 107 fi
112 fi 108 fi
113 109