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 66ff5ffec85347f36abb7c173c66e8f9a23371b6 (commit) via 9a271cf7a8886c09854bdd69e636f1ef56280b1d (commit) via 74fe5c8673d346fd92af79697e018ca8f5c0348e (commit) via 9132bdd7484ce8eb1305aeb4894dd40e721e3f75 (commit) via c5b091fb1085ebdf2000fb0c1006afc1e1a11335 (commit) from 5bfdb4e5398d697bc7dfafd4c91ef38c4b610d68 (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 66ff5ffec85347f36abb7c173c66e8f9a23371b6 Merge: 5bfdb4e53 9a271cf7a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 13 14:50:07 2022 +0000

Merge branch 'next'

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

Summary of changes: config/rootfiles/common/libloc | 1 + config/rootfiles/core/167/filelists/files | 1 + lfs/cdrom | 2 +- src/initscripts/system/collectd | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/libloc b/config/rootfiles/common/libloc index 955e91cde..65c95e98b 100644 --- a/config/rootfiles/common/libloc +++ b/config/rootfiles/common/libloc @@ -1,6 +1,7 @@ usr/bin/location #usr/bin/location-importer #usr/include/libloc +#usr/include/libloc/address.h #usr/include/libloc/as-list.h #usr/include/libloc/as.h #usr/include/libloc/compat.h diff --git a/config/rootfiles/core/167/filelists/files b/config/rootfiles/core/167/filelists/files index 18f533e93..d93e72c77 100644 --- a/config/rootfiles/core/167/filelists/files +++ b/config/rootfiles/core/167/filelists/files @@ -1,5 +1,6 @@ etc/collectd.conf etc/inittab.d +etc/rc.d/init.d/collectd etc/rc.d/init.d/firewall etc/rc.d/init.d/mountfs etc/rc.d/init.d/pakfire diff --git a/lfs/cdrom b/lfs/cdrom index f35ff6a35..ff4821fb5 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -149,7 +149,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

# Clear mtab (prevents .journal problems) rm -vf /etc/mtab - echo > /etc/mtab + ln -s /proc/self/mounts /etc/mtab

# Create filelist for packaging. BUILDTARGET="$(BUILDTARGET)" BUILD_ARCH="$(BUILD_ARCH)" KVER="$(KVER)" \ diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd index 6c58ac3a6..bb8a2f54f 100644 --- a/src/initscripts/system/collectd +++ b/src/initscripts/system/collectd @@ -27,7 +27,7 @@ eval $(/usr/local/bin/readhash /var/ipfire/main/settings) scan_for_sensors() { touch /var/lock/sensors_search # pre scan and try to load modules - "yes" | /usr/sbin/sensors-detect > /dev/null + "yes" | /usr/sbin/sensors-detect > /dev/null 2>&1 if [ -e /etc/sysconfig/lm_sensors ]; then

# Module load @@ -38,7 +38,7 @@ scan_for_sensors() { fi

# Final scan - "yes" | /usr/sbin/sensors-detect > /dev/null + "yes" | /usr/sbin/sensors-detect > /dev/null 2>&1

if [ ! -e /etc/sysconfig/lm_sensors ]; then echo "#No Sensors detected " > /etc/sysconfig/lm_sensors

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