From: Jérémy Rosen <jeremy.rosen@smile.fr>
Date: Fri, 1 Nov 2019 23:03:54 +0000 (+0100)
Subject: allow an empty DefaultInstance= in configuration files
X-Git-Tag: v244-rc1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5395600a0b0a4e01f3f50a860547060290aca34;p=thirdparty%2Fsystemd.git

allow an empty DefaultInstance= in configuration files

It is currently possible to override the DefaultInstance via drop-ins but
not remove it completely. Allow to do that by specifying an empty
DefaultInstance=
---

diff --git a/src/shared/install.c b/src/shared/install.c
index 0724dd96ee7..17f6f99f295 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1191,6 +1191,11 @@ static int config_parse_default_instance(
         if (r < 0)
                 return r;
 
+        if (isempty(printed)) {
+                i->default_instance = mfree(i->default_instance);
+                return 0;
+        }
+
         if (!unit_instance_is_valid(printed))
                 return -EINVAL;