From 1a82a5d2213c686e468154cc55273d952a0f83f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 25 May 2022 14:18:17 +0200
Subject: [PATCH] Supress errors from useradd/groupadd

rhel-only

Resolves: #2217149
---
 sysusers.generate-pre.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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
 }