linux: Don't create bond0 when bonding is being loaded

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index 9b848d21170dd4f593b01b869ff1216f30f984d5..7d3124685a6a1d3837468adde11db222e382fb9f 100644 (file)
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -573,6 +573,7 @@ boot/dtb-KVER
 #boot/dtb-KVER/synaptics/berlin4ct-stb.dtb
 boot/vmlinuz-KVER
 #etc/cpufreq-bench.conf
+etc/modprobe.d/bonding.conf
 etc/modprobe.d/ipv6.conf
 #lib/modules
 #lib/modules/KVER

diff --git a/config/rootfiles/common/riscv64/linux b/config/rootfiles/common/riscv64/linux
index bf0deb05ff12f25da882d85c111ae25be18a00c7..4cb6a0dda9d177875dc8f7ca45548ea7d4e9dbeb 100644 (file)
--- a/config/rootfiles/common/riscv64/linux
+++ b/config/rootfiles/common/riscv64/linux
@@ -13,6 +13,7 @@ boot/dtb-KVER
 #boot/dtb-KVER/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb
 boot/vmlinuz-KVER
 #etc/cpufreq-bench.conf
+etc/modprobe.d/bonding.conf
 etc/modprobe.d/ipv6.conf
 #lib/modules
 #lib/modules/KVER

diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index c58d0a4bb6621eb7614b4500809c61829b0f9921..66484034d86d11d98cfdb1ee3256ed3cfa1c3568 100644 (file)
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -2,6 +2,7 @@ boot/System.map-KVER
 boot/config-KVER
 boot/vmlinuz-KVER
 #etc/cpufreq-bench.conf
+etc/modprobe.d/bonding.conf
 etc/modprobe.d/ipv6.conf
 #lib/modules
 #lib/modules/KVER

diff --git a/lfs/linux b/lfs/linux
index 52f8cb42797ccbfce8ecd23394ddde8bde0335d1..118a0fcf22c2cd880277eb14b7b0906943dfad2b 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -232,6 +232,9 @@ endif
        # Disable ipv6 at runtime
        echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf
 
+       # Do not automatically create bond0 when bonding is being loaded
+       echo "options bonding max_bonds=0" > /etc/modprobe.d/bonding.conf
+
        # build cpupower utility
        cd $(DIR_APP)/tools/power/cpupower && make $(MAKETUNING)
        cd $(DIR_APP)/tools/power/cpupower && make install