Merge pull request #596 from cloudfoundry/merge-jammy

Merge jammy

Author: ystros

bosh-stemcell/spec/support/os_image_linux_kernel_modules_shared_examples.rb

@@ -89,4 +89,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

image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4

@@ -1,12 +1,12 @@
 <metalink xmlns="urn:ietf:params:xml:ns:metalink">
   <file name="ubuntu-jammy.tgz">
-    <hash type="sha-512">303ec6a50529b061bd4d2a449001c0ff350d0e94b0f8844639039ec3fec67c26108958f0c094ddbd133617b1acbaee819c1f387aa4978e7234316241fe67bef1</hash>
-    <hash type="sha-256">af498b1ff41d475ceae06a1af333311eb21ee69b6034e6e8ac97a89b411be2ad</hash>
-    <hash type="sha-1">3cdfd1eb3fb82eb1beee7ab632f43924aa081105</hash>
-    <hash type="md5">da60dff146fd66482caa4547643f35b4</hash>
-    <size>434925866</size>
+    <hash type="sha-512">1c94ae1cd886d8436f8480efee46e7f167aeb16899613c81cb708ddd5a52a59c137c6646aa63d4533d1c02207175b710e35e5169d0e57b4a278246c75da9f1b5</hash>
+    <hash type="sha-256">80e3ec16a9df4a5c5a75089ffa10f868b7cfb9b32ba87a27a6f8800daf3639c0</hash>
+    <hash type="sha-1">d899f9ede9fddfd5a3743a3f8da367b1b11f98d6</hash>
+    <hash type="md5">ebf810fd9f704a56b60ac839aa6e344f</hash>
+    <size>434926013</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
-    <version>1048.0.0</version>
+    <version>1051.0.0</version>
   </file>
   <file name="usn-log.json">
     <hash type="sha-512">d9378b3a430af3ce967861b570ad77af08528260c4812231ff56329936c66a52c64b1c2876caae3ce5775713312dd9e26632d0252468553c1c25d0146c5d8645</hash>
@@ -15,8 +15,8 @@
     <hash type="md5">f2d841b3ccbd4dc7386e7e7b59fb72ce</hash>
     <size>7477</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json</url>
-    <version>1048.0.0</version>
+    <version>1051.0.0</version>
   </file>
   <generator>metalink-repository-resource/0.0.0</generator>
-  <published>2026-05-06T14:34:08.518246102Z</published>
+  <published>2026-05-08T04:03:52.380958953Z</published>
 </metalink>

stemcell_builder/stages/system_kernel_modules/apply.sh

@@ -20,7 +20,11 @@ install squashfs /bin/true
 install udf /bin/true
 install rds /bin/true
 install floppy /bin/true
-install algif_aead /bin/true' >> $chroot/etc/modprobe.d/blacklist.conf
+install algif_aead /bin/true
+install esp4 /bin/true
+install esp6 /bin/true
+install rxrpc /bin/true
+' >> $chroot/etc/modprobe.d/blacklist.conf
 
 echo '# prevent nouveau from loading
 blacklist nouveau