core161: remove python2 module from collectd

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 277f2c88f659ddafc2dde3a2d87115882bcce436..65408dc7fd3c240383bda8607b9ca7a5ea7dedbc 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -3,7 +3,6 @@ etc/collectd.custom
 etc/collectd.precache
 etc/collectd.thermal
 etc/collectd.vpn
-etc/rc.d/init.d/collectd
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S29collectd
 etc/rc.d/rc6.d/K50collectd
@@ -139,9 +138,6 @@ usr/lib/collectd/processes.so
 #usr/lib/collectd/protocols.a
 #usr/lib/collectd/protocols.la
 usr/lib/collectd/protocols.so
-#usr/lib/collectd/python.a
-#usr/lib/collectd/python.la
-usr/lib/collectd/python.so
 #usr/lib/collectd/rrdcached.a
 #usr/lib/collectd/rrdcached.la
 usr/lib/collectd/rrdcached.so
@@ -242,5 +238,6 @@ usr/share/collectd/types.db
 #usr/share/man/man5/collectd-unixsock.5
 #usr/share/man/man5/collectd.conf.5
 #usr/share/man/man5/types.db.5
-#var/lib/collectd
 var/ipfire/ovpn/collectd.vpn
+#var/lib/collectd
+etc/rc.d/init.d/collectd

diff --git a/config/rootfiles/core/161/filelists/collectd b/config/rootfiles/core/161/filelists/collectd
new file mode 120000 (symlink)
index 0000000..871b32f
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/collectd
@@ -0,0 +1 @@
+../../../common/collectd
\ No newline at end of file

diff --git a/config/rootfiles/core/161/update.sh b/config/rootfiles/core/161/update.sh
index 155b85846bb58a47d01a30d48f3d0dfa33cac455..94c3d30a324a7b55218d3a939537ab72a96fa684 100644 (file)
--- a/config/rootfiles/core/161/update.sh
+++ b/config/rootfiles/core/161/update.sh
@@ -93,6 +93,7 @@ rm -rf /usr/bin/python2
 rm -rf /usr/bin/python2.7
 rm -rf /usr/lib/libpython2*
 rm -rf /usr/lib/python2*
+rm -rf /usr/lib/collectd/python.so
 
 # Stop services