Stop using no_pivot when not using rootfs

kubernetes · Aug 22, 2019 · 3e07256 · 3e07256
1 parent 7277a53
commit 3e07256
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/deploy/iso/minikube-iso/package/podman/libpod.conf b/deploy/iso/minikube-iso/package/podman/libpod.conf
diff --git 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))