This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 08215cb5d8012ba9ae0918c251be3f904e0c1aef (commit) via 893ef99ed42b905c9c4500ab75604abd00f70ab5 (commit) from a5b2c82327f2e4697393afd1221ccd866e554248 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 08215cb5d8012ba9ae0918c251be3f904e0c1aef Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 21 13:19:00 2015 +0100

collectd: sync after cfg update and ramdisk backup.

commit 893ef99ed42b905c9c4500ab75604abd00f70ab5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 21 13:05:12 2015 +0100

collectd: fix disable swap plugin if no swap exist.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/86/filelists/files | 1 + src/initscripts/init.d/collectd | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)

Difference in files: diff --git a/config/rootfiles/core/86/filelists/files b/config/rootfiles/core/86/filelists/files index d4622fa..3745701 100644 --- a/config/rootfiles/core/86/filelists/files +++ b/config/rootfiles/core/86/filelists/files @@ -1,6 +1,7 @@ etc/system-release etc/issue etc/modprobe.d/btmrvl_sdio.conf +etc/rc.d/init.d/collectd etc/rc.d/init.d/leds opt/pakfire/etc/pakfire.conf usr/lib/firewall/rules.pl diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd index 7de005e..96bd126 100644 --- a/src/initscripts/init.d/collectd +++ b/src/initscripts/init.d/collectd @@ -84,11 +84,14 @@ case "$1" in fi

# Enable swap plugin if swap found - if [ "$(swapon -s | wc -l)" == "1" ]; then + if [ "$(swapon -s | wc -l)" == "0" ]; then sed -i -e "s|^LoadPlugin swap|#LoadPlugin swap|g" /etc/collectd.conf else sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf fi + + # sync after config update... + sync

if [ $(date +%Y) -gt 2011 ]; then boot_mesg "Starting Collection daemon..." @@ -107,6 +110,8 @@ case "$1" in if [ "$(basename $0)" == "collectd" ]; then /etc/init.d/tmpfs backup fi + # sync after backup... + sync ;; restart) ${0} stop

hooks/post-receive -- IPFire 2.x development tree