diff options
Diffstat (limited to 'meta/classes/boot-directdisk.bbclass')
-rw-r--r-- | meta/classes/boot-directdisk.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index fcdef26fd8..c6ada47479 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass | |||
@@ -58,8 +58,8 @@ inherit ${PCBIOS_CLASS} | |||
58 | inherit ${EFI_CLASS} | 58 | inherit ${EFI_CLASS} |
59 | 59 | ||
60 | DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" | 60 | DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" |
61 | SYSLINUX_ROOT_VM ?= "root=/dev/sda2" | 61 | ROOT_VM ?= "root=/dev/sda2" |
62 | SYSLINUX_CFG_VM ?= "${S}/syslinux_hdd.cfg" | 62 | SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg" |
63 | 63 | ||
64 | boot_direct_populate() { | 64 | boot_direct_populate() { |
65 | dest=$1 | 65 | dest=$1 |
@@ -160,8 +160,8 @@ build_boot_dd() { | |||
160 | 160 | ||
161 | python do_bootdirectdisk() { | 161 | python do_bootdirectdisk() { |
162 | validate_disk_signature(d) | 162 | validate_disk_signature(d) |
163 | set_live_vm_vars(d, 'VM') | ||
163 | if d.getVar("PCBIOS", True) == "1": | 164 | 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) |