Merge 4b4af14a98 into c946b13575

test-namespace: tweak log message a bit
virt: make use of ns inode check in running_in_userns() and running_in_cgroupns() too
2024-11-23 00:15:06 +01:00 · 2024-11-23 00:14:20 +01:00 · 2024-11-23 00:14:20 +01:00 · 2024-11-23 00:14:20 +01:00 · 2024-11-23 00:14:20 +01:00
1 changed files with 1 additions and 1 deletions
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@ -221,7 +221,7 @@ TEST(namespace_is_init) {
                if (r == -EBADR)
                        log_info_errno(r, "In root namespace of type '%s': don't know", namespace_info[t].proc_name);
                else {
-                        assert_se(r >= 0);
+                        ASSERT_OK(r);
                        log_info("In root namespace of type '%s': %s", namespace_info[t].proc_name, yes_no(r));
                }
        }
Author	SHA1	Message	Date
Lennart Poettering	7b4d9d37f9	Merge `4b4af14a98` into `c946b13575`	2024-11-23 00:15:06 +01:00
Lennart Poettering	4b4af14a98	test-namespace: tweak log message a bit	2024-11-23 00:14:20 +01:00
Lennart Poettering	a2429f507c	virt: make use of ns inode check in running_in_userns() and running_in_cgroupns() too	2024-11-23 00:14:20 +01:00
Luca Boccassi	193bf42ab0	detect-virt: check the inode number of the pid namespace The indoe number of root pid namespace is hardcoded in the kernel to 0xEFFFFFFC since 3.8, so check the inode number of our pid namespace if all else fails. If it's not 0xEFFFFFFC then we are in a pid namespace, hence a container environment. Fixes https://github.com/systemd/systemd/issues/35249 [Reworked by Lennart, to make use of namespace_is_init()]	2024-11-23 00:14:20 +01:00
Lennart Poettering	18ead2b03d	namespace-util: add generic namespace_is_init() call	2024-11-23 00:14:20 +01:00