From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Apr 2016 12:10:09 +0000 (+0200)
Subject: nspawn: make -U a tiny bit smarter
X-Git-Tag: v231.3~177
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=inline;h=0cd13b4c1f6a68b1fe79409bf6c5b8fa9351e376;p=elogind.git

nspawn: make -U a tiny bit smarter

With this change -U will turn on user namespacing only if the kernel actually
supports it and otherwise gracefully degrade to non-userns mode.
---

diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index 8e652584d..d010b2bf5 100644
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -21,6 +21,7 @@
 
 #include <stdbool.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 bool uid_is_valid(uid_t uid);
 
@@ -69,3 +70,7 @@ int take_etc_passwd_lock(const char *root);
 
 #define PTR_TO_GID(p) ((gid_t) (((uintptr_t) (p))-1))
 #define GID_TO_PTR(u) ((void*) (((uintptr_t) (u))+1))
+
+static inline bool userns_supported(void) {
+        return access("/proc/self/uid_map", F_OK) >= 0;
+}