Stop using no_pivot when not using rootfs
parent
a4c5992377
commit
ae8894c0ca
|
@ -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 = ""
|
||||
|
|
|
@ -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 = ""
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
|
@ -1,2 +0,0 @@
|
|||
# Whether to use chroot instead of pivot_root in the runtime
|
||||
no_pivot_root = true
|
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue