| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 1 | From beb0219b71510bc63aed81d2a970a04349d6c616 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 29 Sep 2020 18:01:41 -0700 |
| 4 | Subject: [PATCH] Move sysusers.d/sysctl.d/binfmt.d/modules-load.d to /usr |
| 5 | |
| 6 | These directories are moved to /lib since systemd v246, commit |
| 7 | 4a56315a990b ("path: use ROOTPREFIX properly"), but in oe-core/yocto, |
| 8 | the old /usr/lib is still being used. |
| 9 | |
| 10 | Upstream-Status: Inappropriate (OE-specific) |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> |
| 13 | --- |
| 14 | src/core/systemd.pc.in | 8 ++++---- |
| 15 | src/libsystemd/sd-path/sd-path.c | 8 ++++---- |
| 16 | 2 files changed, 8 insertions(+), 8 deletions(-) |
| 17 | |
| 18 | diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in |
| 19 | index fc0f8c34fa..65996bbed8 100644 |
| 20 | --- a/src/core/systemd.pc.in |
| 21 | +++ b/src/core/systemd.pc.in |
| 22 | @@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} |
| 23 | tmpfiles_dir=${prefix}/lib/tmpfiles.d |
| 24 | tmpfilesdir=${tmpfiles_dir} |
| 25 | |
| 26 | -sysusers_dir=${rootprefix}/lib/sysusers.d |
| 27 | +sysusers_dir=${prefix}/lib/sysusers.d |
| 28 | sysusersdir=${sysusers_dir} |
| 29 | |
| 30 | -sysctl_dir=${rootprefix}/lib/sysctl.d |
| 31 | +sysctl_dir=${prefix}/lib/sysctl.d |
| 32 | sysctldir=${sysctl_dir} |
| 33 | |
| 34 | -binfmt_dir=${rootprefix}/lib/binfmt.d |
| 35 | +binfmt_dir=${prefix}/lib/binfmt.d |
| 36 | binfmtdir=${binfmt_dir} |
| 37 | |
| 38 | -modules_load_dir=${rootprefix}/lib/modules-load.d |
| 39 | +modules_load_dir=${prefix}/lib/modules-load.d |
| 40 | modulesloaddir=${modules_load_dir} |
| 41 | |
| 42 | catalog_dir=${prefix}/lib/systemd/catalog |
| 43 | diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c |
| 44 | index ff1e0d5f8e..19a001f47e 100644 |
| 45 | --- a/src/libsystemd/sd-path/sd-path.c |
| 46 | +++ b/src/libsystemd/sd-path/sd-path.c |
| 47 | @@ -362,19 +362,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { |
| 48 | return 0; |
| 49 | |
| 50 | case SD_PATH_SYSUSERS: |
| 51 | - *ret = ROOTPREFIX_NOSLASH "/lib/sysusers.d"; |
| 52 | + *ret = "/usr/lib/sysusers.d"; |
| 53 | return 0; |
| 54 | |
| 55 | case SD_PATH_SYSCTL: |
| 56 | - *ret = ROOTPREFIX_NOSLASH "/lib/sysctl.d"; |
| 57 | + *ret = "/usr/lib/sysctl.d"; |
| 58 | return 0; |
| 59 | |
| 60 | case SD_PATH_BINFMT: |
| 61 | - *ret = ROOTPREFIX_NOSLASH "/lib/binfmt.d"; |
| 62 | + *ret = "/usr/lib/binfmt.d"; |
| 63 | return 0; |
| 64 | |
| 65 | case SD_PATH_MODULES_LOAD: |
| 66 | - *ret = ROOTPREFIX_NOSLASH "/lib/modules-load.d"; |
| 67 | + *ret = "/usr/lib/modules-load.d"; |
| 68 | return 0; |
| 69 | |
| 70 | case SD_PATH_CATALOG: |
| 71 | -- |
| 72 | 2.34.1 |
| 73 | |