From 2b47e72f4f79da1d9834afff1365c3fe15d44116250a95689fedfb6d4ba78630 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Wed, 18 Dec 2024 09:28:30 +0000 Subject: [PATCH] - Revert last changes partly, add Conflict for systemd < 238 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysuser-tools?expand=0&rev=65 --- sysuser-tools.changes | 5 +++++ sysuser-tools.spec | 1 + sysusers2shadow.sh | 6 +----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sysuser-tools.changes b/sysuser-tools.changes index 8e7d40d..23843f4 100644 --- a/sysuser-tools.changes +++ b/sysuser-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 18 09:27:18 UTC 2024 - Thorsten Kukuk + +- Revert last changes partly, add Conflict for systemd < 238 + ------------------------------------------------------------------- Wed Dec 11 11:05:25 UTC 2024 - Thorsten Kukuk diff --git a/sysuser-tools.spec b/sysuser-tools.spec index 35f8a5e..38072dc 100644 --- a/sysuser-tools.spec +++ b/sysuser-tools.spec @@ -42,6 +42,7 @@ Group: System/Packages Requires(pre): (/usr/sbin/useradd or busybox) # prefer original shadow over busybox by default Suggests: shadow +Conflicts: systemd < 238 %description -n sysuser-shadow This package contians a tool, which expects as input a sysusers.d diff --git a/sysusers2shadow.sh b/sysusers2shadow.sh index bc8a0f4..02de246 100644 --- a/sysusers2shadow.sh +++ b/sysusers2shadow.sh @@ -13,11 +13,7 @@ if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1" fi # Use systemd-sysusers and let it read the input directly from stdin - if ! run /usr/bin/systemd-sysusers $REPLACE_ARG - ; then - # Could be that the installed systemd-sysusers is too old - # and does not understand --replace, try again without - run /usr/bin/systemd-sysusers - - fi + run /usr/bin/systemd-sysusers $REPLACE_ARG - else # Absolute path to busybox, if found busybox=