From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 23 Sep 2011 03:33:33 +0000 (+0200)
Subject: util: don't fail if no id was passed to detect_container()
X-Git-Tag: v36~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=799f46d36f1c1f5ce8f638f453feeede3e6842fc;p=systemd

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

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;
                         }