Merge pull request #18 from erikwilson/master

Add util-linux nsenter
k3s-io · May 16, 2020 · ef8bdb2 · ef8bdb2
2 parents 291a43d + ea33efd
commit ef8bdb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -47,6 +47,7 @@ RUN mkdir bin && \
     cp buildroot/output/target/usr/sbin/ethtool bin/ && \
     cp buildroot/output/target/usr/sbin/ipset bin/ && \
     cp buildroot/output/target/usr/bin/find bin/ && \
+    cp buildroot/output/target/usr/bin/nsenter bin/ && \
     cp buildroot/output/target/usr/bin/pigz bin/ && \
     cp buildroot/output/target/usr/bin/slirp4netns bin/ && \
     cp buildroot/output/target/usr/bin/socat bin/ && \

diff --git a/buildroot/config b/buildroot/config
@@ -3772,7 +3772,7 @@ BR2_PACKAGE_UTIL_LINUX_LOSETUP=y
 # BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT is not set
 # BR2_PACKAGE_UTIL_LINUX_NEWGRP is not set
 # BR2_PACKAGE_UTIL_LINUX_NOLOGIN is not set
-# BR2_PACKAGE_UTIL_LINUX_NSENTER is not set
+BR2_PACKAGE_UTIL_LINUX_NSENTER=y
 # BR2_PACKAGE_UTIL_LINUX_PG is not set
 # BR2_PACKAGE_UTIL_LINUX_PARTX is not set
 # BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set