diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-06-12 03:15:19 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-07-28 20:34:03 +0200 |
| commit | b0d3095fd6cc1791a38f57a1982116b4475244ba (patch) | |
| tree | f415bd813a7e07599c969fdd4965390bfdf38cd6 /src/libsystemd/sd-path/sd-path.c | |
| parent | Merge pull request #28551 from mrc0mmand/unit-cleanup-set (diff) | |
| download | systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.tar.xz systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.zip | |
Drop split-usr and unmerged-usr support
As previously announced, execute order 66:
https://lists.freedesktop.org/archives/systemd-devel/2022-September/048352.html
The meson options split-usr, rootlibdir and rootprefix become no-ops
that print a warning if they are set to anything other than the
default values. We can remove them in a future release.
Diffstat (limited to 'src/libsystemd/sd-path/sd-path.c')
| -rw-r--r-- | src/libsystemd/sd-path/sd-path.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c index 36c4d89e06..33adc314d6 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/sd-path/sd-path.c @@ -317,7 +317,7 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { return from_user_dir("XDG_DESKTOP_DIR", buffer, ret); case SD_PATH_SYSTEMD_UTIL: - *ret = ROOTPREFIX_NOSLASH "/lib/systemd"; + *ret = PREFIX_NOSLASH "/lib/systemd"; return 0; case SD_PATH_SYSTEMD_SYSTEM_UNIT: @@ -325,7 +325,7 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { return 0; case SD_PATH_SYSTEMD_SYSTEM_PRESET: - *ret = ROOTPREFIX_NOSLASH "/lib/systemd/system-preset"; + *ret = PREFIX_NOSLASH "/lib/systemd/system-preset"; return 0; case SD_PATH_SYSTEMD_USER_UNIT: @@ -333,7 +333,7 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { return 0; case SD_PATH_SYSTEMD_USER_PRESET: - *ret = ROOTPREFIX_NOSLASH "/lib/systemd/user-preset"; + *ret = PREFIX_NOSLASH "/lib/systemd/user-preset"; return 0; case SD_PATH_SYSTEMD_SYSTEM_CONF: @@ -353,11 +353,11 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { return 0; case SD_PATH_SYSTEMD_SLEEP: - *ret = ROOTPREFIX_NOSLASH "/lib/systemd/system-sleep"; + *ret = PREFIX_NOSLASH "/lib/systemd/system-sleep"; return 0; case SD_PATH_SYSTEMD_SHUTDOWN: - *ret = ROOTPREFIX_NOSLASH "/lib/systemd/system-shutdown"; + *ret = PREFIX_NOSLASH "/lib/systemd/system-shutdown"; return 0; case SD_PATH_TMPFILES: @@ -365,19 +365,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { return 0; case SD_PATH_SYSUSERS: - *ret = ROOTPREFIX_NOSLASH "/lib/sysusers.d"; + *ret = PREFIX_NOSLASH "/lib/sysusers.d"; return 0; case SD_PATH_SYSCTL: - *ret = ROOTPREFIX_NOSLASH "/lib/sysctl.d"; + *ret = PREFIX_NOSLASH "/lib/sysctl.d"; return 0; case SD_PATH_BINFMT: - *ret = ROOTPREFIX_NOSLASH "/lib/binfmt.d"; + *ret = PREFIX_NOSLASH "/lib/binfmt.d"; return 0; case SD_PATH_MODULES_LOAD: - *ret = ROOTPREFIX_NOSLASH "/lib/modules-load.d"; + *ret = PREFIX_NOSLASH "/lib/modules-load.d"; return 0; case SD_PATH_CATALOG: @@ -537,9 +537,6 @@ static int get_search(uint64_t type, char ***list) { true, ARRAY_SBIN_BIN("/usr/local/"), ARRAY_SBIN_BIN("/usr/"), -#if HAVE_SPLIT_USR - ARRAY_SBIN_BIN("/"), -#endif NULL); case SD_PATH_SEARCH_LIBRARY_PRIVATE: @@ -550,9 +547,6 @@ static int get_search(uint64_t type, char ***list) { false, "/usr/local/lib", "/usr/lib", -#if HAVE_SPLIT_USR - "/lib", -#endif NULL); case SD_PATH_SEARCH_LIBRARY_ARCH: @@ -562,9 +556,6 @@ static int get_search(uint64_t type, char ***list) { "LD_LIBRARY_PATH", true, LIBDIR, -#if HAVE_SPLIT_USR - ROOTLIBDIR, -#endif NULL); case SD_PATH_SEARCH_SHARED: |