From a8cfe03ba8f929cfcfd45d554786f4993264a5d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien?= Date: Fri, 5 May 2017 23:04:33 +0200 Subject: [PATCH] fix systemd path in order to add compatibility with SuSe (#2499) --- scripts/post-install.sh | 8 ++++---- scripts/post-remove.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/post-install.sh b/scripts/post-install.sh index 2baabe69a..8942e3579 100644 --- a/scripts/post-install.sh +++ b/scripts/post-install.sh @@ -11,7 +11,7 @@ function install_init { } function install_systemd { - cp -f $SCRIPT_DIR/telegraf.service /lib/systemd/system/telegraf.service + cp -f $SCRIPT_DIR/telegraf.service $1 systemctl enable telegraf || true systemctl daemon-reload || true } @@ -56,10 +56,10 @@ if [[ ! -d /etc/telegraf/telegraf.d ]]; then fi # Distribution-specific logic -if [[ -f /etc/redhat-release ]]; then +if [[ -f /etc/redhat-release ]] || [[ -f /etc/SuSE-release ]]; then # RHEL-variant logic if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then - install_systemd + install_systemd /usr/lib/systemd/system/telegraf.service else # Assuming SysVinit install_init @@ -73,7 +73,7 @@ if [[ -f /etc/redhat-release ]]; then elif [[ -f /etc/debian_version ]]; then # Debian/Ubuntu logic if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then - install_systemd + install_systemd /lib/systemd/system/telegraf.service systemctl restart telegraf || echo "WARNING: systemd not running." else # Assuming SysVinit diff --git a/scripts/post-remove.sh b/scripts/post-remove.sh index b66a3aa9a..b4b6f18fb 100644 --- a/scripts/post-remove.sh +++ b/scripts/post-remove.sh @@ -2,7 +2,7 @@ function disable_systemd { systemctl disable telegraf - rm -f /lib/systemd/system/telegraf.service + rm -f $1 } function disable_update_rcd { @@ -15,14 +15,14 @@ function disable_chkconfig { rm -f /etc/init.d/telegraf } -if [[ -f /etc/redhat-release ]]; then +if [[ -f /etc/redhat-release ]] || [[ -f /etc/SuSE-release ]]; then # RHEL-variant logic if [[ "$1" = "0" ]]; then # InfluxDB is no longer installed, remove from init system rm -f /etc/default/telegraf if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then - disable_systemd + disable_systemd /usr/lib/systemd/system/telegraf.service else # Assuming sysv disable_chkconfig @@ -35,7 +35,7 @@ elif [[ -f /etc/debian_version ]]; then rm -f /etc/default/telegraf if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then - disable_systemd + disable_systemd /lib/systemd/system/telegraf.service else # Assuming sysv # Run update-rc.d or fallback to chkconfig if not available