Accepting request 1204306 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1204306 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysuser-tools?expand=0&rev=31
This commit is contained in:
commit
b7bd900db3
@ -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 -
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 7 13:42:07 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
- Remove check for .buildenv to see failures in OBS
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 7 10:04:38 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
|
@ -82,7 +82,7 @@ m me nogroup
|
||||
EOF
|
||||
|
||||
cat <<EOFF > 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
|
||||
|
@ -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'
|
||||
|
@ -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 -
|
||||
|
Loading…
Reference in New Issue
Block a user