From 799f46d36f1c1f5ce8f638f453feeede3e6842fc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Sep 2011 05:33:33 +0200 Subject: [PATCH] util: don't fail if no id was passed to detect_container() --- src/util.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/util.c b/src/util.c index 33b6fd48..ed3b8d42 100644 --- a/src/util.c +++ b/src/util.c @@ -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; } -- 2.39.5