summaryrefslogtreecommitdiffstats
path: root/meta/classes/boot-directdisk.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/boot-directdisk.bbclass')
-rw-r--r--meta/classes/boot-directdisk.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 89007e315b..fcdef26fd8 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -53,14 +53,13 @@ def pcbios_class(d):
53PCBIOS = "${@pcbios(d)}" 53PCBIOS = "${@pcbios(d)}"
54PCBIOS_CLASS = "${@pcbios_class(d)}" 54PCBIOS_CLASS = "${@pcbios_class(d)}"
55 55
56# Get the build_syslinux_cfg() function from the syslinux class
56inherit ${PCBIOS_CLASS} 57inherit ${PCBIOS_CLASS}
57inherit ${EFI_CLASS} 58inherit ${EFI_CLASS}
58 59
59# Get the build_syslinux_cfg() function from the syslinux class
60
61DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" 60DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
62SYSLINUX_ROOT ?= "root=/dev/sda2" 61SYSLINUX_ROOT_VM ?= "root=/dev/sda2"
63SYSLINUX_TIMEOUT ?= "10" 62SYSLINUX_CFG_VM ?= "${S}/syslinux_hdd.cfg"
64 63
65boot_direct_populate() { 64boot_direct_populate() {
66 dest=$1 65 dest=$1
@@ -162,6 +161,7 @@ build_boot_dd() {
162python do_bootdirectdisk() { 161python do_bootdirectdisk() {
163 validate_disk_signature(d) 162 validate_disk_signature(d)
164 if d.getVar("PCBIOS", True) == "1": 163 if d.getVar("PCBIOS", True) == "1":
164 syslinux_set_vars(d, 'VM')
165 bb.build.exec_func('build_syslinux_cfg', d) 165 bb.build.exec_func('build_syslinux_cfg', d)
166 if d.getVar("EFI", True) == "1": 166 if d.getVar("EFI", True) == "1":
167 bb.build.exec_func('build_efi_cfg', d) 167 bb.build.exec_func('build_efi_cfg', d)