From ea8024f43d7be59e339f7e7c2f38c1f6811cab01 Mon Sep 17 00:00:00 2001 From: Matthew Yeazel Date: Mon, 3 Jun 2024 19:49:33 +0000 Subject: [PATCH] Revert "docker-engine: inject kmod in all containers" This reverts commit e718060e7131264e8072fa6a29b74887e289600c. --- ...02-oci-inject-kmod-in-all-containers.patch | 31 ------------------- packages/docker-engine/docker-engine.spec | 1 - 2 files changed, 32 deletions(-) delete mode 100644 packages/docker-engine/0002-oci-inject-kmod-in-all-containers.patch diff --git a/packages/docker-engine/0002-oci-inject-kmod-in-all-containers.patch b/packages/docker-engine/0002-oci-inject-kmod-in-all-containers.patch deleted file mode 100644 index 0e913524497..00000000000 --- a/packages/docker-engine/0002-oci-inject-kmod-in-all-containers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e35f5eeeaa4c7b9ec1ae0720fc7de0fc4d43e02f Mon Sep 17 00:00:00 2001 -From: Arnaldo Garcia Rincon -Date: Thu, 30 May 2024 14:38:33 +0000 -Subject: [PATCH] oci: inject kmod in all containers - -Append a new mount to the default spec created for Linux containers - -Signed-off-by: Arnaldo Garcia Rincon ---- - oci/defaults.go | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/oci/defaults.go b/oci/defaults.go -index c3dae8b..2e90cfa 100644 ---- a/oci/defaults.go -+++ b/oci/defaults.go -@@ -100,6 +100,12 @@ func DefaultLinuxSpec() specs.Spec { - Source: "shm", - Options: []string{"nosuid", "noexec", "nodev", "mode=1777"}, - }, -+ { -+ Destination: "/sbin/modprobe", -+ Type: "bind", -+ Source: "/usr/bin/kmod", -+ Options: []string{"exec", "bind", "ro"}, -+ }, - }, - Linux: &specs.Linux{ - MaskedPaths: []string{ --- -2.44.0 diff --git a/packages/docker-engine/docker-engine.spec b/packages/docker-engine/docker-engine.spec index f9ad8919ca2..d0cf0e3f7cb 100644 --- a/packages/docker-engine/docker-engine.spec +++ b/packages/docker-engine/docker-engine.spec @@ -30,7 +30,6 @@ Source100: prepare-var-lib-docker.service Source1000: clarify.toml Patch0001: 0001-Change-default-capabilities-using-daemon-config.patch -Patch0002: 0002-oci-inject-kmod-in-all-containers.patch BuildRequires: git BuildRequires: %{_cross_os}glibc-devel