Skip to content

Commit 62da344

Browse files
committed
rpm: migrate to new user/group name
Signed-off-by: Kentaro Hayashi <[email protected]>
1 parent 47a308c commit 62da344

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

fluent-package/yum/fluent-package.spec.in

+23-3
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,34 @@ mkdir -p %{buildroot}/tmp/@PACKAGE_DIR@
139139

140140
%pre
141141
if ! getent group @COMPAT_SERVICE_NAME@ >/dev/null; then
142-
/usr/sbin/groupadd -r @COMPAT_SERVICE_NAME@
142+
if ! getent group @SERVICE_NAME@ >/dev/null; then
143+
/usr/sbin/groupadd -r @SERVICE_NAME@
144+
fi
145+
else
146+
if ! getent group @SERVICE_NAME@ >/dev/null; then
147+
/usr/sbin/groupmod --new-name @SERVICE_NAME@ @COMPAT_SERVICE_NAME@
148+
fi
143149
fi
144150
if ! getent passwd @COMPAT_SERVICE_NAME@ >/dev/null; then
151+
if ! getent passwd @SERVICE_NAME@ >/dev/null; then
145152
%if %{use_suse}
146-
/usr/sbin/useradd -r -g @COMPAT_SERVICE_NAME@ -d %{_localstatedir}/lib/@PACKAGE_DIR@ -s /sbin/nologin -c '@COMPAT_SERVICE_NAME@' @COMPAT_SERVICE_NAME@
153+
/usr/sbin/useradd -r -g @SERVICE_NAME@ -d %{_localstatedir}/lib/@PACKAGE_DIR@ -s /sbin/nologin -c '@SERVICE_NAME@' @SERVICE_NAME@
147154
%else
148-
/usr/sbin/adduser -r -g @COMPAT_SERVICE_NAME@ -d %{_localstatedir}/lib/@PACKAGE_DIR@ -s /sbin/nologin -c '@COMPAT_SERVICE_NAME@' @COMPAT_SERVICE_NAME@
155+
/usr/sbin/adduser -r -g @SERVICE_NAME@ -d %{_localstatedir}/lib/@PACKAGE_DIR@ -s /sbin/nologin -c '@SERVICE_NAME@' @SERVICE_NAME@
149156
%endif
157+
fi
158+
else
159+
if ! getent passwd @SERVICE_NAME@ >/dev/null; then
160+
systemctl is-active @COMPAT_SERVICE_NAME@
161+
if [ $? -eq 0 ]; then
162+
# Avoid renaming with running process
163+
systemctl stop @[email protected]
164+
/usr/sbin/usermod --login @SERVICE_NAME@ @COMPAT_SERVICE_NAME@
165+
systemctl start @[email protected]
166+
else
167+
/usr/sbin/usermod --login @SERVICE_NAME@ @COMPAT_SERVICE_NAME@
168+
fi
169+
fi
150170
fi
151171

152172
%preun

0 commit comments

Comments
 (0)