From a65bd010dd1dbcc68b24d87a0b20a58897161bae Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: May 25 2022 12:18:25 +0000
Subject: Supress errors from useradd/groupadd


---

diff --git a/systemd.spec b/systemd.spec
index 04053f9..4763dd4 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1018,6 +1018,9 @@ fi
 %files standalone-sysusers -f .file-list-standalone-sysusers
 
 %changelog
+* Wed May 25 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 251.1-2
+- Supress errors from useradd/groupadd (#2090129)
+
 * Tue May 24 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 251.1-1
 - First bugfix release for 250
 - Two fixes for kernel-install and a revert for #2087225, #2088788.
diff --git a/sysusers.generate-pre.sh b/sysusers.generate-pre.sh
index fd9938d..95a0938 100755
--- a/sysusers.generate-pre.sh
+++ b/sysusers.generate-pre.sh
@@ -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
 }