From 17c6fe8b77721ea742400c8b01e1889b93549032 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Sat, 24 Dec 2016 12:27:55 +0900 Subject: [PATCH] dist/redhat: don't try to adduser when user is already exists Currently we get "failed adding user 'scylla'" on .rpm installation when user is already exists, we can skip it to prevent error. Fixes #1958 Signed-off-by: Takuya ASADA Message-Id: <1482550075-27939-1-git-send-email-syuu@scylladb.com> (cherry picked from commit f3e45bc9ef2bc447924f9c6650454a325e2f473c) --- dist/redhat/scylla.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/redhat/scylla.spec.in b/dist/redhat/scylla.spec.in index 0760555960da..eaca57c5c161 100644 --- a/dist/redhat/scylla.spec.in +++ b/dist/redhat/scylla.spec.in @@ -110,8 +110,8 @@ cp -r scylla-housekeeping $RPM_BUILD_ROOT%{_prefix}/lib/scylla/scylla-housekeepi cp -P dist/common/sbin/* $RPM_BUILD_ROOT%{_sbindir}/ %pre server -/usr/sbin/groupadd scylla 2> /dev/null || : -/usr/sbin/useradd -g scylla -s /sbin/nologin -r -d %{_sharedstatedir}/scylla scylla 2> /dev/null || : +getent group scylla || /usr/sbin/groupadd scylla 2> /dev/null || : +getent passwd scylla || /usr/sbin/useradd -g scylla -s /sbin/nologin -r -d %{_sharedstatedir}/scylla scylla 2> /dev/null || : %post server # Upgrade coredump settings