aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--templates/boot/generic-base-boot.jinja26
-rw-r--r--templates/boot/generic-grub-tftp.jinja22
-rw-r--r--templates/machines/raspberrypi4.jinja22
3 files changed, 8 insertions, 2 deletions
diff --git a/templates/boot/generic-base-boot.jinja2 b/templates/boot/generic-base-boot.jinja2
index cfd113f..d5f05a2 100644
--- a/templates/boot/generic-base-boot.jinja2
+++ b/templates/boot/generic-base-boot.jinja2
@@ -1,5 +1,11 @@
{%- extends 'base/agl-simple.jinja2' %}
{%- if rootfs_type == 'nbd' %}
+{%- block main %}
+{{ super () }}
+# context allows specific values to be overridden or included
+context:
+ extra_kernel_args: systemd.mask=systemd-network-generator.service
+{%- endblock %}
{%- block deploy %}
{{ super() }}
protocols:
diff --git a/templates/boot/generic-grub-tftp.jinja2 b/templates/boot/generic-grub-tftp.jinja2
index 7c02040..192abd0 100644
--- a/templates/boot/generic-grub-tftp.jinja2
+++ b/templates/boot/generic-grub-tftp.jinja2
@@ -9,7 +9,7 @@ protocols:
# context allows specific values to be overridden or included
context:
- extra_kernel_args: initrd={{ initrd }} systemd.mask=systemd-networkd.service
+ extra_kernel_args: initrd={{ initrd }} systemd.mask=systemd-network-generator.service
{%- endif %}
{% endblock %}
{%- block boot %}
diff --git a/templates/machines/raspberrypi4.jinja2 b/templates/machines/raspberrypi4.jinja2
index 7f04b8f..5c4ed27 100644
--- a/templates/machines/raspberrypi4.jinja2
+++ b/templates/machines/raspberrypi4.jinja2
@@ -20,5 +20,5 @@
{{ super() }}
context:
console_device: ttyS0
- extra_kernel_args: " coherent_pool=1M 8250.nr_uarts=1 rw fstab=no "
+ extra_kernel_args: " coherent_pool=1M 8250.nr_uarts=1 rw fstab=no systemd.mask=systemd-network-generator.service"
{% endblock %}