]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
environment-d-generator: do not include /lib/environment.d in the list
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 2 Jan 2019 16:34:55 +0000 (17:34 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 18 Feb 2019 09:29:33 +0000 (10:29 +0100)
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

index 9d64d95738c4eabb708848b2bb42b4eef193d198..b2558f0c842892b40e821fdb2828938c3985517b 100644 (file)
@@ -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;