From 8be669332bae1554f45a69e4b8ea1a3c94a7e43b Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 17 Jun 2022 16:19:56 -0500 Subject: [PATCH] The container support we're using went into the kernel in 2010, we're past the 7 year support horizon. Remove probe. --- scripts/genconfig.sh | 10 ---------- toys/other/nsenter.c | 2 -- 2 files changed, 12 deletions(-) diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh index ee409619..11c1c4cb 100755 --- a/scripts/genconfig.sh +++ b/scripts/genconfig.sh @@ -23,16 +23,6 @@ probesymbol() probeconfig() { - # Probe for container support on target - probesymbol TOYBOX_CONTAINER << EOF - #include - #include - #include - int x=CLONE_NEWNS|CLONE_NEWUTS|CLONE_NEWIPC|CLONE_NEWNET; - - int main(int argc, char *argv[]){printf("%d", x+SYS_unshare+ SYS_setns);} -EOF - # Android and some other platforms miss utmpx probesymbol TOYBOX_UTMPX -c << EOF #include diff --git a/toys/other/nsenter.c b/toys/other/nsenter.c index d0c75d01..6f144988 100644 --- a/toys/other/nsenter.c +++ b/toys/other/nsenter.c @@ -18,7 +18,6 @@ USE_UNSHARE(NEWTOY(unshare, "<1^f(fork);r(map-root-user);i:(ipc);m:(mount);n:(ne config UNSHARE bool "unshare" default y - depends on TOYBOX_CONTAINER help usage: unshare [-imnpuUr] COMMAND... @@ -39,7 +38,6 @@ config UNSHARE config NSENTER bool "nsenter" - depends on TOYBOX_CONTAINER default y help usage: nsenter [-t pid] [-F] [-i] [-m] [-n] [-p] [-u] [-U] COMMAND... -- 2.39.2