Skip to content

Commit b474c31

Browse files
committed
Stop using no_pivot when not using rootfs
1 parent d821b07 commit b474c31

File tree

6 files changed

+3
-10
lines changed

6 files changed

+3
-10
lines changed

deploy/addons/gvisor/gvisor-config.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ oom_score = 0
3636
max_container_log_line_size = 16384
3737
[plugins.cri.containerd]
3838
snapshotter = "overlayfs"
39-
no_pivot = true
39+
no_pivot = false
4040
[plugins.cri.containerd.default_runtime]
4141
runtime_type = "io.containerd.runtime.v1.linux"
4242
runtime_engine = ""

deploy/iso/minikube-iso/package/containerd-bin/config.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ oom_score = 0
3636
max_container_log_line_size = 16384
3737
[plugins.cri.containerd]
3838
snapshotter = "overlayfs"
39-
no_pivot = true
39+
no_pivot = false
4040
[plugins.cri.containerd.default_runtime]
4141
runtime_type = "io.containerd.runtime.v1.linux"
4242
runtime_engine = ""

deploy/iso/minikube-iso/package/crio-bin/crio.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ grpc_max_recv_msg_size = 16777216
9292
default_runtime = "runc"
9393

9494
# If true, the runtime will not use pivot_root, but instead use MS_MOVE.
95-
no_pivot = true
95+
no_pivot = false
9696

9797
# Path to the conmon binary, used for monitoring the OCI runtime.
9898
conmon = "/usr/libexec/crio/conmon"

deploy/iso/minikube-iso/package/podman/buildah.profile

-3
This file was deleted.

deploy/iso/minikube-iso/package/podman/libpod.conf

-2
This file was deleted.

deploy/iso/minikube-iso/package/podman/podman.mk

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ endef
2929

3030
define PODMAN_INSTALL_TARGET_CMDS
3131
$(INSTALL) -Dm755 $(@D)/bin/podman $(TARGET_DIR)/usr/bin/podman
32-
$(INSTALL) -Dm644 $(BR2_EXTERNAL_MINIKUBE_PATH)/package/podman/libpod.conf $(TARGET_DIR)/etc/containers/libpod.conf
33-
$(INSTALL) -Dm644 $(BR2_EXTERNAL_MINIKUBE_PATH)/package/podman/buildah.profile $(TARGET_DIR)/etc/profile.d/podman.sh
3432
endef
3533

3634
$(eval $(generic-package))

0 commit comments

Comments
 (0)