shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

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

Browse Source
This commit is contained in:
Lennart Poettering 2011-09-23 05:33:33 +02:00
parent 65bc2c2114
commit 799f46d36f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util.c
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;
}