From fc0451bc0a3fefd44bc9c533e352763f70fd9a40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9my=20Rosen?= Date: Sat, 2 Nov 2019 00:03:54 +0100 Subject: [PATCH] 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= (cherry picked from commit b5395600a0b0a4e01f3f50a860547060290aca34) --- src/shared/install.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/shared/install.c b/src/shared/install.c index 0724dd96ee..17f6f99f29 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; -- 2.25.1