From a1088879d80d3236faa70e03282b48ac4ae4dc6384772c9d6e316f1ee2d97d5f Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Thu, 19 Dec 2024 22:01:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/sysuser-tools?expand=0&rev=67 --- sysuser-tools.changes | 5 ----- sysuser-tools.spec | 1 - sysusers2shadow.sh | 4 +++- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sysuser-tools.changes b/sysuser-tools.changes index 23843f4..8e7d40d 100644 --- a/sysuser-tools.changes +++ b/sysuser-tools.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 38072dc..35f8a5e 100644 --- a/sysuser-tools.spec +++ b/sysuser-tools.spec @@ -42,7 +42,6 @@ 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 d754e7d..bea119e 100644 --- a/sysusers2shadow.sh +++ b/sysusers2shadow.sh @@ -13,7 +13,9 @@ 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 - run /usr/bin/systemd-sysusers $REPLACE_ARG - + if ! run /usr/bin/systemd-sysusers $REPLACE_ARG - ; then + run /usr/bin/systemd-sysusers - + fi else # Absolute path to busybox, if found busybox=