diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-04-22 14:10:09 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-04-25 12:16:02 +0200 |
commit | ccabee0d6465f06b9d339cf449fd8eea0db13373 (patch) | |
tree | d9742d9281a08fa46d9840619ba21a4746a0b30a /src/basic | |
parent | d2e5535f9d945db3ca20ed264e1fe1ce99707bba (diff) |
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.
Diffstat (limited to 'src/basic')
-rw-r--r-- | src/basic/user-util.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/basic/user-util.h b/src/basic/user-util.h index c23f1d485d..8026eca3f4 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); @@ -63,3 +64,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; +} |