summaryrefslogtreecommitdiff
path: root/src/sysext
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2021-02-22 18:45:36 +0000
committerLuca Boccassi <luca.boccassi@microsoft.com>2021-02-23 15:34:46 +0000
commit280b3781bd03a728e1e2f78ad85ac3df4b4b010b (patch)
tree007a83d44d40d6f8c719d0089b2f16f1b62ce85d /src/sysext
parent685097b9cadf92d21dfa857c3a7ddc1ba115088e (diff)
downloadsystemd-280b3781bd03a728e1e2f78ad85ac3df4b4b010b.tar.gz
sysext: split parsing SYSTEMD_SYSEXT_HIERARCHIES in a common helper
Diffstat (limited to 'src/sysext')
-rw-r--r--src/sysext/sysext.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 60f4dee353..f68eaa12db 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -982,16 +982,10 @@ static int run(int argc, char *argv[]) {
/* For debugging purposes it might make sense to do this for other hierarchies than /usr/ and
* /opt/, but let's make that a hacker/debugging feature, i.e. env var instead of cmdline
* switch. */
- r = getenv_path_list("SYSTEMD_SYSEXT_HIERARCHIES", &arg_hierarchies);
+ r = parse_env_extension_hierarchies(&arg_hierarchies);
if (r < 0)
return log_error_errno(r, "Failed to parse $SYSTEMD_SYSEXT_HIERARCHIES environment variable: %m");
- if (!arg_hierarchies) {
- arg_hierarchies = strv_new("/usr", "/opt");
- if (!arg_hierarchies)
- return log_oom();
- }
-
return sysext_main(argc, argv);
}