From 1877b519f470fb07b0e1890193ed5fad648a8052e03157c7855e9207b5ce01cf Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Thu, 11 Feb 2021 13:54:52 +0000 Subject: [PATCH] Accepting request 871218 from home:kukuk:etc - Remove sysusers/nscd workaround OBS-URL: https://build.opensuse.org/request/show/871218 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysuser-tools?expand=0&rev=41 --- sysuser-tools.changes | 5 +++++ sysusers2shadow.sh | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sysuser-tools.changes b/sysuser-tools.changes index 9bae581..167ebe8 100644 --- a/sysuser-tools.changes +++ b/sysuser-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 11 13:54:01 UTC 2021 - Thorsten Kukuk + +- Remove sysusers/nscd workaround + ------------------------------------------------------------------- Fri Jan 29 13:36:08 UTC 2021 - Thorsten Kukuk diff --git a/sysusers2shadow.sh b/sysusers2shadow.sh index ebb9d50..6f2352e 100644 --- a/sysusers2shadow.sh +++ b/sysusers2shadow.sh @@ -9,15 +9,11 @@ run() { if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then - test -n "$1" && REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1" ||: + if [ -n "$1" ]; then + REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1" ||: + fi # Use systemd-sysusers and let it read the input directly from stdin /usr/bin/systemd-sysusers $REPLACE_ARG - - # We need to clear the nscd cache, as systemd-sysusers could have - # triggered a negative cache entry - if [ -x /usr/sbin/nscd ]; then - /usr/sbin/nscd -i passwd ||: - /usr/sbin/nscd -i group ||: - fi else # Absolute path to busybox, if found