From b474c315aec2be28c0720234de287b39b152cfa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Wed, 14 Aug 2019 23:50:24 +0200 Subject: [PATCH] Stop using no_pivot when not using rootfs --- deploy/addons/gvisor/gvisor-config.toml | 2 +- deploy/iso/minikube-iso/package/containerd-bin/config.toml | 2 +- deploy/iso/minikube-iso/package/crio-bin/crio.conf | 2 +- deploy/iso/minikube-iso/package/podman/buildah.profile | 3 --- deploy/iso/minikube-iso/package/podman/libpod.conf | 2 -- deploy/iso/minikube-iso/package/podman/podman.mk | 2 -- 6 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 deploy/iso/minikube-iso/package/podman/buildah.profile delete mode 100644 deploy/iso/minikube-iso/package/podman/libpod.conf diff --git a/deploy/addons/gvisor/gvisor-config.toml b/deploy/addons/gvisor/gvisor-config.toml index 034be8a4e57c..999ac0245856 100644 --- a/deploy/addons/gvisor/gvisor-config.toml +++ b/deploy/addons/gvisor/gvisor-config.toml @@ -36,7 +36,7 @@ oom_score = 0 max_container_log_line_size = 16384 [plugins.cri.containerd] snapshotter = "overlayfs" - no_pivot = true + no_pivot = false [plugins.cri.containerd.default_runtime] runtime_type = "io.containerd.runtime.v1.linux" runtime_engine = "" diff --git a/deploy/iso/minikube-iso/package/containerd-bin/config.toml b/deploy/iso/minikube-iso/package/containerd-bin/config.toml index ae7fe958038a..6a64bb6e5c90 100644 --- a/deploy/iso/minikube-iso/package/containerd-bin/config.toml +++ b/deploy/iso/minikube-iso/package/containerd-bin/config.toml @@ -36,7 +36,7 @@ oom_score = 0 max_container_log_line_size = 16384 [plugins.cri.containerd] snapshotter = "overlayfs" - no_pivot = true + no_pivot = false [plugins.cri.containerd.default_runtime] runtime_type = "io.containerd.runtime.v1.linux" runtime_engine = "" diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.conf b/deploy/iso/minikube-iso/package/crio-bin/crio.conf index 2d96ded019b8..be5b5505e4ee 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio.conf +++ b/deploy/iso/minikube-iso/package/crio-bin/crio.conf @@ -92,7 +92,7 @@ grpc_max_recv_msg_size = 16777216 default_runtime = "runc" # If true, the runtime will not use pivot_root, but instead use MS_MOVE. -no_pivot = true +no_pivot = false # Path to the conmon binary, used for monitoring the OCI runtime. conmon = "/usr/libexec/crio/conmon" diff --git a/deploy/iso/minikube-iso/package/podman/buildah.profile b/deploy/iso/minikube-iso/package/podman/buildah.profile deleted file mode 100644 index 8ca368b053c1..000000000000 --- a/deploy/iso/minikube-iso/package/podman/buildah.profile +++ /dev/null @@ -1,3 +0,0 @@ -# BUILDAH_NOPIVOT=true disables pivot_root in Buildah, using MS_MOVE instead. -# (Buildah is used by Podman for building container images using a Dockerfile) -export BUILDAH_NOPIVOT=true diff --git a/deploy/iso/minikube-iso/package/podman/libpod.conf b/deploy/iso/minikube-iso/package/podman/libpod.conf deleted file mode 100644 index b5d19cd85190..000000000000 --- a/deploy/iso/minikube-iso/package/podman/libpod.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Whether to use chroot instead of pivot_root in the runtime -no_pivot_root = true diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 72867365981f..8450e7dfde0a 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -29,8 +29,6 @@ endef define PODMAN_INSTALL_TARGET_CMDS $(INSTALL) -Dm755 $(@D)/bin/podman $(TARGET_DIR)/usr/bin/podman - $(INSTALL) -Dm644 $(BR2_EXTERNAL_MINIKUBE_PATH)/package/podman/libpod.conf $(TARGET_DIR)/etc/containers/libpod.conf - $(INSTALL) -Dm644 $(BR2_EXTERNAL_MINIKUBE_PATH)/package/podman/buildah.profile $(TARGET_DIR)/etc/profile.d/podman.sh endef $(eval $(generic-package))