diff options
| author | Matt Hart <matthew.hart@linaro.org> | 2018-06-04 18:27:57 +0100 |
|---|---|---|
| committer | Guillaume Tucker <guillaume.tucker@collabora.com> | 2018-06-28 10:15:14 +0100 |
| commit | 7f871342e044adaa11d65e5d799d8397b09beb4d (patch) | |
| tree | cfe2991e7a44f5a10b15ec315f5bd61891cbaa77 /templates | |
| parent | 4fd1111479d2fdd9c172f4da0da981da3cd6d00b (diff) | |
Pass the image shell prompt to the templates
Diffstat (limited to 'templates')
10 files changed, 10 insertions, 31 deletions
diff --git a/templates/boot-be/generic-uboot-tftp-ramdisk-boot-be-template.jinja2 b/templates/boot-be/generic-uboot-tftp-ramdisk-boot-be-template.jinja2 index 03d2999..935c249 100644 --- a/templates/boot-be/generic-uboot-tftp-ramdisk-boot-be-template.jinja2 +++ b/templates/boot-be/generic-uboot-tftp-ramdisk-boot-be-template.jinja2 @@ -16,7 +16,5 @@ method: u-boot commands: ramdisk prompts: - - 'linaro-test' - - 'root@debian:~#' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} diff --git a/templates/boot-nfs/generic-depthcharge-tftp-nfs-template.jinja2 b/templates/boot-nfs/generic-depthcharge-tftp-nfs-template.jinja2 index debc0e2..c86047d 100644 --- a/templates/boot-nfs/generic-depthcharge-tftp-nfs-template.jinja2 +++ b/templates/boot-nfs/generic-depthcharge-tftp-nfs-template.jinja2 @@ -18,7 +18,5 @@ method: depthcharge commands: nfs prompts: - - 'linaro-test' - - 'root@debian:~#' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} diff --git a/templates/boot-nfs/generic-grub-tftp-nfs-template.jinja2 b/templates/boot-nfs/generic-grub-tftp-nfs-template.jinja2 index b3feaf4..fc85133 100644 --- a/templates/boot-nfs/generic-grub-tftp-nfs-template.jinja2 +++ b/templates/boot-nfs/generic-grub-tftp-nfs-template.jinja2 @@ -16,7 +16,5 @@ method: grub commands: nfs prompts: - - 'linaro-test' - - 'root@debian:~#' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} diff --git a/templates/boot-nfs/generic-ipxe-tftp-nfs-template.jinja2 b/templates/boot-nfs/generic-ipxe-tftp-nfs-template.jinja2 index 01413f6..955b00f 100644 --- a/templates/boot-nfs/generic-ipxe-tftp-nfs-template.jinja2 +++ b/templates/boot-nfs/generic-ipxe-tftp-nfs-template.jinja2 @@ -16,7 +16,5 @@ method: ipxe commands: nfs prompts: - - 'linaro-test' - - 'root@debian:~#' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} diff --git a/templates/boot-nfs/generic-uboot-tftp-nfs-template.jinja2 b/templates/boot-nfs/generic-uboot-tftp-nfs-template.jinja2 index d088535..66fe4b7 100644 --- a/templates/boot-nfs/generic-uboot-tftp-nfs-template.jinja2 +++ b/templates/boot-nfs/generic-uboot-tftp-nfs-template.jinja2 @@ -16,7 +16,5 @@ method: u-boot commands: nfs prompts: - - 'linaro-test' - - 'root@debian:~#' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} diff --git a/templates/boot/generic-depthcharge-tftp-ramdisk-template.jinja2 b/templates/boot/generic-depthcharge-tftp-ramdisk-template.jinja2 index 28fbeb3..5587aad 100644 --- a/templates/boot/generic-depthcharge-tftp-ramdisk-template.jinja2 +++ b/templates/boot/generic-depthcharge-tftp-ramdisk-template.jinja2 @@ -18,7 +18,5 @@ method: depthcharge commands: ramdisk prompts: - - 'linaro-test' - - 'root@debian:~#' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} diff --git a/templates/boot/generic-grub-tftp-ramdisk-template.jinja2 b/templates/boot/generic-grub-tftp-ramdisk-template.jinja2 index 0397256..de831f9 100644 --- a/templates/boot/generic-grub-tftp-ramdisk-template.jinja2 +++ b/templates/boot/generic-grub-tftp-ramdisk-template.jinja2 @@ -16,7 +16,5 @@ method: grub commands: ramdisk prompts: - - 'linaro-test' - - 'root@debian:~#' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} diff --git a/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2 b/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2 index 90f1a7c..069453c 100644 --- a/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2 +++ b/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2 @@ -16,7 +16,5 @@ method: ipxe commands: ramdisk prompts: - - 'linaro-test' - - 'root@debian:~#' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} diff --git a/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2 b/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2 index 721fba0..935c249 100644 --- a/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2 +++ b/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2 @@ -16,8 +16,5 @@ method: u-boot commands: ramdisk prompts: - - 'linaro-test' - - 'root@debian:~#' - - '(initramfs)' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} diff --git a/templates/boot/qemu-generic-boot-template.jinja2 b/templates/boot/qemu-generic-boot-template.jinja2 index e3fda92..39736de 100644 --- a/templates/boot/qemu-generic-boot-template.jinja2 +++ b/templates/boot/qemu-generic-boot-template.jinja2 @@ -45,7 +45,5 @@ actions: method: qemu media: tmpfs prompts: - - 'linaro-test' - - 'root@debian:~#' - - '/ #' + - '{{ rootfs_prompt }}' {% endblock %} |