From 85fa97c45ccbbeeb48f76dd8b14a687bc1846133 Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Thu, 9 Jun 2022 13:56:22 -0400 Subject: =?UTF-8?q?Remove=20unnescesary=20=E2=80=98cleanup=E2=80=99=20code?= =?UTF-8?q?.=20(#13103)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was causing the updter to be unconditionally disabled on static builds, and we don’t actually _need_ any of it anymore since we’ve already decoupled the auto-update handling state from the installation process (in fact, this should have been removed then, but it got missed somehow). --- packaging/installer/functions.sh | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'packaging/installer/functions.sh') diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh index fe2fed7816..8bf7fafcfa 100644 --- a/packaging/installer/functions.sh +++ b/packaging/installer/functions.sh @@ -981,35 +981,6 @@ install_netdata_updater() { return 0 } -cleanup_old_netdata_updater() { - if [ -f "${NETDATA_PREFIX}"/usr/libexec/netdata-updater.sh ]; then - echo >&2 "Removing updater from deprecated location" - rm -f "${NETDATA_PREFIX}"/usr/libexec/netdata-updater.sh - fi - - if issystemd && [ -n "$(get_systemd_service_dir)" ] ; then - systemctl disable netdata-updater.timer - rm -f "$(get_systemd_service_dir)/netdata-updater.timer" - rm -f "$(get_systemd_service_dir)/netdata-updater.service" - fi - - if [ -d /etc/cron.daily ]; then - rm -f /etc/cron.daily/netdata-updater.sh - rm -f /etc/cron.daily/netdata-updater - fi - - if [ -d /etc/periodic/daily ]; then - rm -f /etc/periodic/daily/netdata-updater.sh - rm -f /etc/periodic/daily/netdata-updater - fi - - if [ -d /etc/cron.d ]; then - rm -f /etc/cron.d/netdata-updater - fi - - return 0 -} - set_netdata_updater_channel() { sed -i -e "s/^RELEASE_CHANNEL=.*/RELEASE_CHANNEL=\"${RELEASE_CHANNEL}\"/" "${NETDATA_USER_CONFIG_DIR}/.environment" } -- cgit v1.2.3