diff options
Diffstat (limited to 'templates/boot')
| -rw-r--r-- | templates/boot/agl-prompt.jinja | 5 | ||||
| -rw-r--r-- | templates/boot/generic-uboot-tftp.jinja2 | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/templates/boot/agl-prompt.jinja b/templates/boot/agl-prompt.jinja index 9d8cd50..731434b 100644 --- a/templates/boot/agl-prompt.jinja +++ b/templates/boot/agl-prompt.jinja @@ -1,5 +1,8 @@ - prompts: ["root@{{ yocto_machine }}:~"] + prompts: + - "root@{{ yocto_machine }}:~" + - '/ #' + auto_login: login_prompt: "login:" username: root diff --git a/templates/boot/generic-uboot-tftp.jinja2 b/templates/boot/generic-uboot-tftp.jinja2 index a7fa6ce..4baa405 100644 --- a/templates/boot/generic-uboot-tftp.jinja2 +++ b/templates/boot/generic-uboot-tftp.jinja2 @@ -10,7 +10,6 @@ protocols: {% endblock %} {%- block boot %} {{ super() }} - type: {{ uboot_type|default("bootm") }} commands: {{ boot_commands|default("ramdisk") }} {%- if rootfs_type == 'nbd' %} transfer_overlay: @@ -22,15 +21,15 @@ protocols: {{ super() }} kernel: url: {{ kernel_url }} + type: {{ kernel_type }} {%- if rootfs_type == 'nbd' %} initrd: - url: {{ nbdinitrd_url }} + url: {{ initrd_url }} allow_modify: false nbdroot: - url: {{ nbdroot_url }} - compression: {{ nbdroot_compression }} -{%- endif %} -{%- if initrd_url and rootfs_type != 'nbd' %} + url: {{ rootfs_url }} + compression: {{ rootfs_compression }} +{%- elif rootfs_type == 'ramdisk' %} ramdisk: url: {{ initrd_url }} compression: {{ initrd_compression }} |