diff options
| author | Maanya Goenka <maanyagoenka@microsoft.com> | 2023-08-08 23:57:53 +0200 |
|---|---|---|
| committer | Maanya Goenka <maanyagoenka@microsoft.com> | 2023-08-15 20:34:46 +0200 |
| commit | 55ea4ef096543d2bceea9315868d5aca945d7a57 (patch) | |
| tree | f5e78d3d30371ef5d2d40aef1097205f2ab26f45 /src/shared/extension-util.c | |
| parent | add an @ option for confext (diff) | |
| download | systemd-55ea4ef096543d2bceea9315868d5aca945d7a57.tar.xz systemd-55ea4ef096543d2bceea9315868d5aca945d7a57.zip | |
allow ExtensionImages= and ExtensionDirectories= settings to support confext images
Diffstat (limited to 'src/shared/extension-util.c')
| -rw-r--r-- | src/shared/extension-util.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/shared/extension-util.c b/src/shared/extension-util.c index 43a19bf262..d8b16b94e1 100644 --- a/src/shared/extension-util.c +++ b/src/shared/extension-util.c @@ -136,6 +136,9 @@ int parse_env_extension_hierarchies(char ***ret_hierarchies, const char *hierarc else if (streq(hierarchy_env, "SYSTEMD_SYSEXT_HIERARCHIES")) /* Default for sysext when unset */ l = strv_new("/usr", "/opt"); + else if (streq(hierarchy_env, "SYSTEMD_SYSEXT_AND_CONFEXT_HIERARCHIES")) + /* Combined sysext and confext directories */ + l = strv_new("/usr", "/opt", "/etc"); else return -ENXIO; } else if (r < 0) |