From f6df0307e9daf69a9f38bcfbf8f220edc99a0558 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Sat, 4 Jun 2011 13:03:16 +0200 Subject: [PATCH] core: fix retain status file over an init script reload #1579 refs #1579 --- Changelog | 1 + daemon-init.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index dd621511c..6c2fc0b44 100644 --- a/Changelog +++ b/Changelog @@ -8,6 +8,7 @@ ENHANCEMENTS FIXES * core: remove duplicated unlinks for check result files with multiple results #1615 +* core: fix retain status file over an init script reload #1579 * classic ui: fix cross site scripting vulnerability in config.cgi on config expander arguments #1605 diff --git a/daemon-init.in b/daemon-init.in index 416e66af6..bca82f9a9 100644 --- a/daemon-init.in +++ b/daemon-init.in @@ -130,7 +130,7 @@ start(){ exit 1 else echo "Icinga PID $IcingaPID not running. Removing lockfile." - rm -f $IcingaStatusFile $IcingaRunFile $IcingaLockDir/$IcingaLockFile $IcingaCommandFile + rm -f $IcingaRunFile $IcingaLockDir/$IcingaLockFile fi fi @@ -180,7 +180,7 @@ case "$1" in echo 'Warning - icinga did not exit in a timely manner. Please try again.' else echo 'Stopping icinga done.' - rm -f $IcingaStatusFile $IcingaRunFile $IcingaLockDir/$IcingaLockFile $IcingaCommandFile + rm -f $IcingaRunFile $IcingaLockDir/$IcingaLockFile fi ;;