clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-04 07:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: don't fail if no id was passed to detect_container()

Browse Source
This commit is contained in:
Lennart Poettering
2011-09-23 16:28:27 +02:00
parent 65bc2c2114
commit 799f46d36f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util.c
+9 -3
View File
@@ -4445,17 +4445,23 @@ int detect_container(const char **id) {
if (streq(line, "container=lxc")) {
fclose(f);
*id = "lxc";
if (id)
*id = "lxc";
return 1;
} else if (streq(line, "container=systemd-nspawn")) {
fclose(f);
*id = "systemd-nspawn";
if (id)
*id = "systemd-nspawn";
return 1;
} else if (startswith(line, "container=")) {
fclose(f);
*id = "other-container";
if (id)
*id = "other-container";
return 1;
}