Merge pull request #606 from cloudfoundry/revert-595-more-module-refactoring

Revert "More module refactoring"

Author: selzoc

bosh-stemcell/spec/support/os_image_linux_kernel_modules_shared_examples.rb

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

stemcell_builder/stages/system_kernel_modules/apply.sh

@@ -21,9 +21,6 @@ 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