Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rpm: do not delete system account #598

Merged
merged 3 commits into from
Nov 17, 2023
Merged

rpm: do not delete system account #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
571ffdb
rpm: do not delete system account
kenhys Nov 7, 2023
785b647
rpm: test whether system account is kept or not
kenhys Nov 7, 2023
c080016
test: switch test which depends on both of released/non-released(loca…
kenhys Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions fluent-package/yum/fluent-package.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,26 +284,6 @@ if [ $1 -eq 0 ]; then
fi
fi

if [ $1 -eq 0 ]; then
# Removing
if getent passwd @SERVICE_NAME@ >/dev/null; then
echo "Removing @SERVICE_NAME@ user..."
/usr/sbin/userdel --remove @SERVICE_NAME@
fi
if getent group @SERVICE_NAME@ >/dev/null; then
echo "Removing @SERVICE_NAME@ group..."
/usr/sbin/groupdel @SERVICE_NAME@
fi
if getent passwd @COMPAT_SERVICE_NAME@ >/dev/null; then
echo "Removing @COMPAT_SERVICE_NAME@ user..."
/usr/sbin/userdel --remove @COMPAT_SERVICE_NAME@
fi
if getent group @COMPAT_SERVICE_NAME@ >/dev/null; then
echo "Removing @COMPAT_SERVICE_NAME@ group..."
/usr/sbin/groupdel @COMPAT_SERVICE_NAME@
fi
fi

%posttrans
if [ -f %{v4migration} ]; then
if [ ! -f /usr/sbin/@COMPAT_SERVICE_NAME@ ]; then
Expand Down
4 changes: 2 additions & 2 deletions fluent-package/yum/install-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ for conf_path in /etc/td-agent/td-agent.conf /etc/fluent/fluentd.conf; do
fi
done

(! getent passwd fluentd >/dev/null)
(! getent group fluentd >/dev/null)
getent passwd fluentd >/dev/null
getent group fluentd >/dev/null
kenhys marked this conversation as resolved.
Show resolved Hide resolved

if [ $ENABLE_UPGRADE_TEST -eq 1 ]; then
echo "UPGRADE TEST from v4"
Expand Down
12 changes: 12 additions & 0 deletions fluent-package/yum/systemd-test/install-newly.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ test -e /var/log/fluent/fluentd.log
sudo $DNF remove -y fluent-package
sudo systemctl daemon-reload

case $1 in
local)
getent passwd fluentd >/dev/null
getent group fluentd >/dev/null
;;
*)
# TODO: Remove this branch after the following fix is applied to the latest release.
# https://github.com/fluent/fluent-package-builder/pull/598
(! getent passwd fluentd >/dev/null)
(! getent group fluentd >/dev/null)
;;
esac
# `sudo systemctl daemon-reload` clears the service completely.
# (The result of `systemctl status` will be `unfound`)
# Note: RPM does not leave links like `@/etc/systemd/system/fluentd.service`.
Expand Down
5 changes: 5 additions & 0 deletions fluent-package/yum/systemd-test/update-from-v4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ test -e /var/log/fluent/fluentd.log
sudo $DNF remove -y fluent-package
sudo systemctl daemon-reload

getent passwd td-agent >/dev/null
getent group td-agent >/dev/null
getent passwd fluentd >/dev/null
getent group fluentd >/dev/null

# `sudo systemctl daemon-reload` clears the service completely.
# (The result of `systemctl status` will be `unfound`)
# Note: RPM does not leave links like `@/etc/systemd/system/fluentd.service`.
Expand Down
6 changes: 6 additions & 0 deletions fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,9 @@ test -e /var/log/fluent/fluentd.log
sudo $DNF remove -y fluent-package
(! systemctl status --no-pager td-agent)
(! systemctl status --no-pager fluentd)

getent passwd td-agent >/dev/null
getent group td-agent >/dev/null
getent passwd fluentd >/dev/null
getent group fluentd >/dev/null

5 changes: 5 additions & 0 deletions fluent-package/yum/systemd-test/update-to-next-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ test -e /var/log/fluent/fluentd.log
sudo $DNF remove -y fluent-package
sudo systemctl daemon-reload

(! getent passwd td-agent >/dev/null)
(! getent group td-agent >/dev/null)
getent passwd fluentd >/dev/null
getent group fluentd >/dev/null

# `sudo systemctl daemon-reload` clears the service completely.
# (The result of `systemctl status` will be `unfound`)
# Note: RPM does not leave links like `@/etc/systemd/system/fluentd.service`.
Expand Down
Loading