Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame^] | 1 | From 258af8106cbed6fa53f7bee042bf903e58b57a41 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 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> |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame^] | 13 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 14 | --- |
| 15 | src/core/systemd.pc.in | 8 ++++---- |
| 16 | src/libsystemd/sd-path/sd-path.c | 8 ++++---- |
| 17 | 2 files changed, 8 insertions(+), 8 deletions(-) |
| 18 | |
| 19 | diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame^] | 20 | index 693433b34b..8368a3ff02 100644 |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 21 | --- a/src/core/systemd.pc.in |
| 22 | +++ b/src/core/systemd.pc.in |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame^] | 23 | @@ -67,16 +67,16 @@ tmpfilesdir=${tmpfiles_dir} |
| 24 | |
| 25 | user_tmpfiles_dir=${prefix}/share/user-tmpfiles.d |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 26 | |
| 27 | -sysusers_dir=${rootprefix}/lib/sysusers.d |
| 28 | +sysusers_dir=${prefix}/lib/sysusers.d |
| 29 | sysusersdir=${sysusers_dir} |
| 30 | |
| 31 | -sysctl_dir=${rootprefix}/lib/sysctl.d |
| 32 | +sysctl_dir=${prefix}/lib/sysctl.d |
| 33 | sysctldir=${sysctl_dir} |
| 34 | |
| 35 | -binfmt_dir=${rootprefix}/lib/binfmt.d |
| 36 | +binfmt_dir=${prefix}/lib/binfmt.d |
| 37 | binfmtdir=${binfmt_dir} |
| 38 | |
| 39 | -modules_load_dir=${rootprefix}/lib/modules-load.d |
| 40 | +modules_load_dir=${prefix}/lib/modules-load.d |
| 41 | modulesloaddir=${modules_load_dir} |
| 42 | |
| 43 | catalog_dir=${prefix}/lib/systemd/catalog |
| 44 | diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c |
Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame^] | 45 | index ac33e349c0..f0615ffb22 100644 |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 46 | --- a/src/libsystemd/sd-path/sd-path.c |
| 47 | +++ b/src/libsystemd/sd-path/sd-path.c |
| 48 | @@ -362,19 +362,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { |
| 49 | return 0; |
| 50 | |
| 51 | case SD_PATH_SYSUSERS: |
| 52 | - *ret = ROOTPREFIX_NOSLASH "/lib/sysusers.d"; |
| 53 | + *ret = "/usr/lib/sysusers.d"; |
| 54 | return 0; |
| 55 | |
| 56 | case SD_PATH_SYSCTL: |
| 57 | - *ret = ROOTPREFIX_NOSLASH "/lib/sysctl.d"; |
| 58 | + *ret = "/usr/lib/sysctl.d"; |
| 59 | return 0; |
| 60 | |
| 61 | case SD_PATH_BINFMT: |
| 62 | - *ret = ROOTPREFIX_NOSLASH "/lib/binfmt.d"; |
| 63 | + *ret = "/usr/lib/binfmt.d"; |
| 64 | return 0; |
| 65 | |
| 66 | case SD_PATH_MODULES_LOAD: |
| 67 | - *ret = ROOTPREFIX_NOSLASH "/lib/modules-load.d"; |
| 68 | + *ret = "/usr/lib/modules-load.d"; |
| 69 | return 0; |
| 70 | |
| 71 | case SD_PATH_CATALOG: |