Merge pull request #27380 from rootfs/fix-nsenter-list

Automatic merge from submit-queue in nsenter mounter, read hosts PID 1 /proc/mounts to list the mounts fix #27378

Merge pull request #27380 from rootfs/fix-nsenter-list
51dd3d56 · k8s-merge-robot · GitHub · a025e20f · 8e67a308 · 51dd3d56
Commit 51dd3d56 authored Jun 19, 2016 by k8s-merge-robot Committed by GitHub Jun 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

nsenter_mount.go pkg/util/mount/nsenter_mount.go +1 -1

No files found.
--- a/pkg/util/mount/nsenter_mount.go
+++ b/pkg/util/mount/nsenter_mount.go
@@ -88,7 +88,7 @@ var _ = Interface(&NsenterMounter{})

 const (
 	hostRootFsPath     = "/rootfs"
-	hostProcMountsPath = "/rootfs/proc/mounts"
+	hostProcMountsPath = "/rootfs/proc/1/mounts"
 	nsenterPath        = "nsenter"
 )