- 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
This commit is contained in:
Thorsten Kukuk 2024-12-18 09:28:30 +00:00 committed by Git OBS Bridge
parent a572aa9c30
commit 2b47e72f4f
3 changed files with 7 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 18 09:27:18 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
- Revert last changes partly, add Conflict for systemd < 238
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 11 11:05:25 UTC 2024 - Thorsten Kukuk <kukuk@suse.com> Wed Dec 11 11:05:25 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>

View File

@ -42,6 +42,7 @@ Group: System/Packages
Requires(pre): (/usr/sbin/useradd or busybox) Requires(pre): (/usr/sbin/useradd or busybox)
# prefer original shadow over busybox by default # prefer original shadow over busybox by default
Suggests: shadow Suggests: shadow
Conflicts: systemd < 238
%description -n sysuser-shadow %description -n sysuser-shadow
This package contians a tool, which expects as input a sysusers.d This package contians a tool, which expects as input a sysusers.d

View File

@ -13,11 +13,7 @@ if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then
REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1" REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1"
fi fi
# Use systemd-sysusers and let it read the input directly from stdin # Use systemd-sysusers and let it read the input directly from stdin
if ! run /usr/bin/systemd-sysusers $REPLACE_ARG - ; then run /usr/bin/systemd-sysusers $REPLACE_ARG -
# Could be that the installed systemd-sysusers is too old
# and does not understand --replace, try again without
run /usr/bin/systemd-sysusers -
fi
else else
# Absolute path to busybox, if found # Absolute path to busybox, if found
busybox= busybox=