From 9eaf14a35a978f23ac44cca66f59fdf55730f5af Mon Sep 17 00:00:00 2001 From: Chris Selzo Date: Tue, 2 Jun 2026 13:58:53 -0700 Subject: [PATCH] Revert "Revert "More module refactoring"" --- ...age_linux_kernel_modules_shared_examples.rb | 18 ++++++++++++++++++ .../stages/system_kernel_modules/apply.sh | 3 +++ 2 files changed, 21 insertions(+) diff --git a/bosh-stemcell/spec/support/os_image_linux_kernel_modules_shared_examples.rb b/bosh-stemcell/spec/support/os_image_linux_kernel_modules_shared_examples.rb index 0d8dcb2131..00a162fcf6 100644 --- a/bosh-stemcell/spec/support/os_image_linux_kernel_modules_shared_examples.rb +++ b/bosh-stemcell/spec/support/os_image_linux_kernel_modules_shared_examples.rb @@ -95,4 +95,22 @@ its(:content) { should match "install algif_aead /bin/true" } end end + + context "prevent esp4 module from being loaded" do + describe file("/etc/modprobe.d/blacklist.conf") do + its(:content) { should match "install esp4 /bin/true" } + end + end + + context "prevent esp6 module from being loaded" do + describe file("/etc/modprobe.d/blacklist.conf") do + its(:content) { should match "install esp6 /bin/true" } + end + end + + context "prevent rxrpc module from being loaded" do + describe file("/etc/modprobe.d/blacklist.conf") do + its(:content) { should match "install rxrpc /bin/true" } + end + end end diff --git a/stemcell_builder/stages/system_kernel_modules/apply.sh b/stemcell_builder/stages/system_kernel_modules/apply.sh index e1aeedfc31..06587a747a 100755 --- a/stemcell_builder/stages/system_kernel_modules/apply.sh +++ b/stemcell_builder/stages/system_kernel_modules/apply.sh @@ -21,6 +21,9 @@ install udf /bin/true install rds /bin/true install floppy /bin/true install algif_aead /bin/true +install esp4 /bin/true +install esp6 /bin/true +install rxrpc /bin/true options ipv6 disable=1' >> $chroot/etc/modprobe.d/blacklist.conf echo '# prevent nouveau from loading