Supress errors from useradd/groupadd

rhel-only

Resolves: #2217149
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-05-25 14:18:17 +02:00 committed by Christian Glombek
parent eac5440e8e
commit 1a82a5d221

View File

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