diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2017-09-21 20:07:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2017-09-21 20:07:46 +0000 |
| commit | 2fecbc0916bae86505375c49a3bc82ae9354b928 (patch) | |
| tree | bdd4e63ea9e6a9077441afe9d0f141e4044391c6 /templates/base | |
| parent | bab5b166526f66d409eff09e12ac7f5db97b93b6 (diff) | |
| parent | 6d8721a6c24bb6b681d9c369e0032a05e54db26a (diff) | |
Merge "rfs-image: provide command line options to setup the image name"
Diffstat (limited to 'templates/base')
| -rw-r--r-- | templates/base/agl-base-defaults.jinja2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2 index c8b18b4..af82379 100644 --- a/templates/base/agl-base-defaults.jinja2 +++ b/templates/base/agl-base-defaults.jinja2 @@ -21,13 +21,13 @@ {%- if rootfs_type == 'nbd' %} {%- set deploy_to = "nbd" %} {%- set boot_commands = "nbd" %} -{%- set nbdroot = nbdroot|default("core-image-minimal-" + yocto_machine + ".ext4.xz") %} +{%- set nbdroot = rfs_image|default("core-image-minimal-" + yocto_machine + ".ext4.xz") %} {%- set nbdroot_url = nbdroot_url|default(baseurl(nbdroot)) %} {%- set nbdroot_compression = nbdroot_compression|default(nbdroot|get_extension) %} {%- set nbdinitrd = nbdinitrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz") %} {%- set nbdinitrd_url = nbdinitrd_url|default(baseurl(nbdinitrd)) %} {%- elif rootfs_type == 'ramdisk' %} -{%- set initrd = initrd|default("initramfs-boot-image-" + yocto_machine +".gz") %} +{%- set initrd = rfs_image|default("initramfs-boot-image-" + yocto_machine + ".gz") %} {%- set initrd_compression = initrd_compression|default(initrd|get_extension) %} {%- endif %} {%- if initrd %} |