From 7613a265438648cbadb5e1ddd6cacd987c6629d3 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 20 Apr 2020 18:46:46 +0800 Subject: [PATCH] procd: fix jail when running on glibc --- package/system/procd/Makefile | 2 +- ...1-include-nsswitch-in-jail-for-gilbc.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 package/system/procd/patches/001-include-nsswitch-in-jail-for-gilbc.patch diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 9f71f6bb49..231a0ca058 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git diff --git a/package/system/procd/patches/001-include-nsswitch-in-jail-for-gilbc.patch b/package/system/procd/patches/001-include-nsswitch-in-jail-for-gilbc.patch new file mode 100644 index 0000000000..221378b8d6 --- /dev/null +++ b/package/system/procd/patches/001-include-nsswitch-in-jail-for-gilbc.patch @@ -0,0 +1,30 @@ +From d200b70e5d5b0b3b61e2573f1c2fa22b3fa9d63a Mon Sep 17 00:00:00 2001 +From: Daniel Golle +Date: Sun, 19 Apr 2020 23:06:51 +0100 +Subject: [PATCH] jail: include /etc/nsswitch.conf in jail for glibc. + +/etc/nsswitch.conf is needed to resolve usernames and groups from +/etc/passwd and /etc/groups, name resoultion and a bunch of other +things when using glibc. +Mount /etc/nsswitch.conf in jail when building against glibc. + +Reported-by: Tobias Waldvogel +Signed-off-by: Daniel Golle +--- + jail/jail.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/jail/jail.c ++++ b/jail/jail.c +@@ -545,6 +545,11 @@ int main(int argc, char **argv) + add_mount("/etc/group", 0, -1); + } + ++#if defined(__GLIBC__) ++ if (!opts.extroot) ++ add_mount("/etc/nsswitch.conf", 0, -1); ++#endif ++ + if (!(opts.namespace & CLONE_NEWNET)) { + add_mount("/etc/resolv.conf", 0, -1); + }