diff --git a/disable-systemd-sysusers.patch b/disable-systemd-sysusers.patch index b20c46e..5865c2e 100644 --- a/disable-systemd-sysusers.patch +++ b/disable-systemd-sysusers.patch @@ -7,7 +7,7 @@ -if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then - - if [ -n "$1" ] && [ "$1" != "%3" ]; then -- REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1" ||: +- 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 - diff --git a/sysuser-tools.changes b/sysuser-tools.changes index 8f9b81e..a697d9c 100644 --- a/sysuser-tools.changes +++ b/sysuser-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 7 13:42:07 UTC 2024 - Thorsten Kukuk + +- Remove check for .buildenv to see failures in OBS + ------------------------------------------------------------------- Wed Aug 7 10:04:38 UTC 2024 - Thorsten Kukuk diff --git a/sysuser-tools.spec b/sysuser-tools.spec index 2c87d22..e32d459 100644 --- a/sysuser-tools.spec +++ b/sysuser-tools.spec @@ -82,7 +82,7 @@ m me nogroup EOF cat < expected-account-pre -/usr/sbin/sysusers2shadow me.conf <<"EOF" || [ -f /.buildenv ] +/usr/sbin/sysusers2shadow me.conf <<"EOF" u me - "myself" /dev/null m me nogroup g asdf diff --git a/sysusers-generate-pre b/sysusers-generate-pre index 824ba71..bd1f8d7 100644 --- a/sysusers-generate-pre +++ b/sysusers-generate-pre @@ -1,6 +1,6 @@ #!/bin/bash # pass systemd sysusers config paths as argument to this script. -echo "/usr/sbin/sysusers2shadow $2 <<\"EOF\" || [ -f /.buildenv ]" +echo "/usr/sbin/sysusers2shadow $2 <<\"EOF\"" (while read -r line; do if [[ $line =~ ^\s*[ugmr] ]]; then echo "$line"; fi; done) < "$1" echo 'EOF' diff --git a/sysusers2shadow.sh b/sysusers2shadow.sh index 4441888..d754e7d 100644 --- a/sysusers2shadow.sh +++ b/sysusers2shadow.sh @@ -10,7 +10,7 @@ run() { if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then if [ -n "$1" ] && [ "$1" != "%3" ]; then - REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1" ||: + 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 -