From 87a46d7e62a46ef3c6a1f9cd93753e63c95d40d7 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Thu, 19 Jan 2023 23:50:09 +0100 Subject: Change the mask to the systemd-network-generator.service It is not systemd-networkd that does bite use here, it is the systemd-network-generator.service that will interfere with our settings. This is triggered by the ip=dhcp setting on the kernel cmdline and even the removed wired.network file will not prevent his from interfering and taking the network interface down and up for another dhcp run. Question is ... WHY ?!: The interface IS already configured. Connmand can be configured to ignore it and does actually ignore or at least not take it down. Signed-off-by: Jan-Simon Moeller Change-Id: I2872ddfbc97e26ae84fcc3640a9129c28691557c --- templates/boot/generic-base-boot.jinja2 | 6 ++++++ templates/boot/generic-grub-tftp.jinja2 | 2 +- templates/machines/raspberrypi4.jinja2 | 2 +- 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 %} -- cgit 1.2.3-korg