From 51932aace29b1919638809a4a78ec683e4b74590 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 19 Jul 2023 08:03:34 +0000 Subject: [PATCH] buster: prevent automatic creation of bond0 and dummy0 at boot Import systemd's modprobe config added in newer versions [1][2] to inhibit legacy automatic bond0 and dummy0 netdevice creation by the drivers. This requires building the drivers as modules, so switch them from =y to =m. Note that we can only do that for arm64, since x86_64 current does not enable dummy or bond support. [1] https://github.com/systemd/systemd/commit/582faeb461aa0dd01b55bf6c9b1433532fc927d3 [2] https://github.com/systemd/systemd/commit/cfe134e3120cc8d8874abc96d2ccb3fcf189c64d Signed-off-by: Jonas Gorski --- .../overlay/etc/modprobe.d/systemd.conf | 21 +++++++++++++++++++ .../configs/arm64-all/arm64-all.config | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 builds/any/rootfs/buster/common/overlay/etc/modprobe.d/systemd.conf diff --git a/builds/any/rootfs/buster/common/overlay/etc/modprobe.d/systemd.conf b/builds/any/rootfs/buster/common/overlay/etc/modprobe.d/systemd.conf new file mode 100644 index 000000000..6368920f4 --- /dev/null +++ b/builds/any/rootfs/buster/common/overlay/etc/modprobe.d/systemd.conf @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# When bonding module is loaded, it creates bond0 by default due to max_bonds +# option default value 1. This interferes with the network configuration +# management / networkd, as it is not possible to detect whether this bond0 was +# intentionally configured by the user, or should be managed by +# networkd/NM/etc. Therefore disable bond0 creation. + +options bonding max_bonds=0 + +# Do the same for dummy0. + +options dummy numdummies=0 + diff --git a/packages/base/any/kernels/5.15-lts/configs/arm64-all/arm64-all.config b/packages/base/any/kernels/5.15-lts/configs/arm64-all/arm64-all.config index 70b21a059..fdfbca936 100644 --- a/packages/base/any/kernels/5.15-lts/configs/arm64-all/arm64-all.config +++ b/packages/base/any/kernels/5.15-lts/configs/arm64-all/arm64-all.config @@ -2205,8 +2205,8 @@ CONFIG_MD=y CONFIG_NETDEVICES=y CONFIG_MII=y CONFIG_NET_CORE=y -CONFIG_BONDING=y -CONFIG_DUMMY=y +CONFIG_BONDING=m +CONFIG_DUMMY=m CONFIG_WIREGUARD=y # CONFIG_WIREGUARD_DEBUG is not set # CONFIG_EQUALIZER is not set