Compare commits
No commits in common. "factory" and "main" have entirely different histories.
@ -7,7 +7,7 @@
|
|||||||
-if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then
|
-if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then
|
||||||
-
|
-
|
||||||
- if [ -n "$1" ] && [ "$1" != "%3" ]; then
|
- if [ -n "$1" ] && [ "$1" != "%3" ]; 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
|
||||||
- run /usr/bin/systemd-sysusers $REPLACE_ARG -
|
- run /usr/bin/systemd-sysusers $REPLACE_ARG -
|
||||||
|
@ -1,8 +1,3 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
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>
|
Wed Aug 7 10:04:38 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ m me nogroup
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat <<EOFF > expected-account-pre
|
cat <<EOFF > expected-account-pre
|
||||||
/usr/sbin/sysusers2shadow me.conf <<"EOF"
|
/usr/sbin/sysusers2shadow me.conf <<"EOF" || [ -f /.buildenv ]
|
||||||
u me - "myself" /dev/null
|
u me - "myself" /dev/null
|
||||||
m me nogroup
|
m me nogroup
|
||||||
g asdf
|
g asdf
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# pass systemd sysusers config paths as argument to this script.
|
# pass systemd sysusers config paths as argument to this script.
|
||||||
|
|
||||||
echo "/usr/sbin/sysusers2shadow $2 <<\"EOF\""
|
echo "/usr/sbin/sysusers2shadow $2 <<\"EOF\" || [ -f /.buildenv ]"
|
||||||
(while read -r line; do if [[ $line =~ ^\s*[ugmr] ]]; then echo "$line"; fi; done) < "$1"
|
(while read -r line; do if [[ $line =~ ^\s*[ugmr] ]]; then echo "$line"; fi; done) < "$1"
|
||||||
echo 'EOF'
|
echo 'EOF'
|
||||||
|
@ -10,7 +10,7 @@ run() {
|
|||||||
if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then
|
if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then
|
||||||
|
|
||||||
if [ -n "$1" ] && [ "$1" != "%3" ]; then
|
if [ -n "$1" ] && [ "$1" != "%3" ]; 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
|
||||||
run /usr/bin/systemd-sysusers $REPLACE_ARG -
|
run /usr/bin/systemd-sysusers $REPLACE_ARG -
|
||||||
|
Loading…
Reference in New Issue
Block a user