Adding upstream version 255.4.upstream/255.4

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 36 insertions, 0 deletions

diff --git a/modprobe.d/README b/modprobe.d/README
new file mode 100644
index 0000000..4c11e46
--- /dev/null
+++ b/modprobe.d/README
@@ -0,0 +1,7 @@
+Files in this directory contain configuration for modprobe, a program to load
+kernel modules.
+
+See man:modprobe.d(5) for explanation of the configuration file format, and
+man:modprobe(8) for a description of the program itself.
+
+Use 'systemd-analyze cat-config modprobe.d' to display the effective config.
diff --git a/modprobe.d/meson.build b/modprobe.d/meson.build
new file mode 100644
index 0000000..0d7ce56
--- /dev/null
+++ b/modprobe.d/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+install_data('README',
+             'systemd.conf',
+             install_dir : modprobedir)
diff --git a/modprobe.d/systemd.conf b/modprobe.d/systemd.conf
new file mode 100644
index 0000000..e6499a0
--- /dev/null
+++ b/modprobe.d/systemd.conf
@@ -0,0 +1,24 @@
+#  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
+
+# Do the same for ifb0.
+
+options ifb numifbs=0