diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-10-10 17:34:37 +0000 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-10-11 10:36:15 +0200 |
| commit | 15a26d6192ed24cb97f443a06a1514e82e58b43f (patch) | |
| tree | 32e4e5fafd847dc730a6388f13f701acb0d0acb3 | |
| parent | 790e23df67e54dc124f213df203f0f2960477045 (diff) | |
| download | NetworkManager-15a26d6192ed24cb97f443a06a1514e82e58b43f.tar.gz | |
platform/tests: skip root tests when we can't mount /sys/devices
| -rw-r--r-- | src/platform/tests/test-common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index b1947a6d11..51d2a5e234 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -1554,6 +1554,10 @@ unshare_user (void) uid_t uid = geteuid (); gid_t gid = getegid (); + /* Don't try to set up the namespaces if we're in a container. */ + if (!nmtstp_is_sysfs_writable ()) + return FALSE; + /* Already a root? */ if (gid == 0 && uid == 0) return TRUE; |