From 0f9828e5cf2a58f3f9be78ff32e97601c31356aa Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Sat, 4 Dec 2021 00:09:18 +0100 Subject: [PATCH] package/systemd: adopt odering in nsswitch to newer versions This modifies the order of the nss modules, reflecting the current state of the documentation. nss-mymachines lost support for resolution of users and groups, and now only does resolution of hostnames. Changed in v246. Multiple changes in regards to nss-myhostname now recommend placement after nss-files and before nss-dns. See commits ce266330, f918c67. nss-resolve handles the nss-files logic itself, and its suggested to move in front of nss-files. Changed in v249. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 330619e206..540a4d64f9 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -602,13 +602,11 @@ define SYSTEMD_INSTALL_NSSCONFIG_HOOK -e '/^gshadow:/ {/systemd/! s/$$/ systemd/}' \ $(if $(BR2_PACKAGE_SYSTEMD_RESOLVED), \ -e '/^hosts:/ s/[[:space:]]*mymachines//' \ - -e '/^hosts:/ {/resolve/! s/files/files resolve [!UNAVAIL=return]/}' ) \ + -e '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' ) \ $(if $(BR2_PACKAGE_SYSTEMD_MYHOSTNAME), \ - -e '/^hosts:/ {/myhostname/! s/$$/ myhostname/}' ) \ + -e '/^hosts:/ {/myhostname/! s/files/files myhostname/}' ) \ $(if $(BR2_PACKAGE_SYSTEMD_MACHINED), \ - -e '/^passwd:/ {/mymachines/! s/files/files mymachines/}' \ - -e '/^group:/ {/mymachines/! s/files/files [SUCCESS=merge] mymachines/}' \ - -e '/^hosts:/ {/mymachines/! s/files/files mymachines/}' ) \ + -e '/^hosts:/ {/mymachines/! s/^\(hosts:[[:space:]]*\)/\1mymachines /}' ) \ $(TARGET_DIR)/etc/nsswitch.conf endef