From 3dd84d4615a1bce46f5958718a677556c791a45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 2 Jan 2019 17:34:55 +0100 Subject: [PATCH] environment-d-generator: do not include /lib/environment.d in the list This makes the code match documentation (opposite compared to previous commits). This is user configuration, hence it should not depend on stuff in /lib/ even when split-usr is used. --- src/environment-d-generator/environment-d-generator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c index 9d64d95738..b2558f0c84 100644 --- a/src/environment-d-generator/environment-d-generator.c +++ b/src/environment-d-generator/environment-d-generator.c @@ -14,7 +14,7 @@ static int environment_dirs(char ***ret) { _cleanup_free_ char *c = NULL; int r; - dirs = strv_split_nulstr(CONF_PATHS_NULSTR("environment.d")); + dirs = strv_new(CONF_PATHS_USR("environment.d"), NULL); if (!dirs) return -ENOMEM;