From 815a04ffeefc4ac1b1c6009f02901cbd3fdbd26e Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 6 Oct 2017 19:11:24 +0000 Subject: Revert "Move boot type to kernel type" This reverts commit 364641197bfe95512555abc36b7b62ac48166aaf. Unfortunately, NBD jobs do not work with the new kernel type, so we can't remove the old boot type (at least until NBD is fixed.) Change-Id: If9a64135ef75771a90655fdc4c6429d9b494fcf0 Signed-off-by: Kevin Hilman --- templates/boot/generic-uboot-tftp.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/boot/generic-uboot-tftp.jinja2') diff --git a/templates/boot/generic-uboot-tftp.jinja2 b/templates/boot/generic-uboot-tftp.jinja2 index 4baa405..0f0f9e2 100644 --- a/templates/boot/generic-uboot-tftp.jinja2 +++ b/templates/boot/generic-uboot-tftp.jinja2 @@ -10,6 +10,7 @@ protocols: {% endblock %} {%- block boot %} {{ super() }} + type: {{ uboot_type|default("bootm") }} commands: {{ boot_commands|default("ramdisk") }} {%- if rootfs_type == 'nbd' %} transfer_overlay: @@ -21,7 +22,6 @@ protocols: {{ super() }} kernel: url: {{ kernel_url }} - type: {{ kernel_type }} {%- if rootfs_type == 'nbd' %} initrd: url: {{ initrd_url }} -- cgit 1.2.3-korg