rpms
/
systemd
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Supress errors from useradd/groupadd 

(cherry picked from commit a65bd010dd)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-05-25 14:18:17 +02:00
parent cfee8d47db
commit 1ff9b90627
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
systemd.spec
View File

@ -1010,6 +1010,7 @@ fi
* Wed May 25 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 250.5-1
- Add Conflicts for older systemd and systemd-udev versions to fix issue with
files being moved between subpackages (rhbz#2051019)
- Supress errors from useradd/groupadd (#2090129)
* Fri May 20 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 250.5-1
- Latest upstream bugfix release (one was skipped because we were in freeze)

14
sysusers.generate-pre.sh
View File

@ -19,15 +19,15 @@ user() {
if [ "$uid" = '-' ] || [ "$uid" = '' ]; then
cat <<EOF
getent passwd '$user' >/dev/null || \\
useradd -r -g '$group' -d '$home' -s '$shell' -c '$desc' '$user'
useradd -r -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :
EOF
else
cat <<EOF
if ! getent passwd '$user' >/dev/null ; then
if ! getent passwd '$uid' >/dev/null ; then
useradd -r -u '$uid' -g '$group' -d '$home' -s /sbin/nologin -c '$desc' '$user'
if ! getent passwd '$user' >/dev/null; then
if ! getent passwd '$uid' >/dev/null; then
useradd -r -u '$uid' -g '$group' -d '$home' -s /sbin/nologin -c '$desc' '$user' || :
else
useradd -r -g '$group' -d '$home' -s /sbin/nologin -c '$desc' '$user'
useradd -r -g '$group' -d '$home' -s /sbin/nologin -c '$desc' '$user' || :
fi
fi
@ -40,11 +40,11 @@ group() {
gid="$2"
if [ "$gid" = '-' ]; then
cat <<-EOF
getent group '$group' >/dev/null || groupadd -r '$group'
getent group '$group' >/dev/null || groupadd -r '$group' || :
EOF
else
cat <<-EOF
getent group '$group' >/dev/null || groupadd -f -g '$gid' -r '$group'
getent group '$group' >/dev/null || groupadd -f -g '$gid' -r '$group' || :
EOF
fi
}