collectd: fix rootfiles

the turbostat plugin is only present on x86_64 so we need a separate rootfile
on x86_64.

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

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 26976dc8747c0a4bb4021aa191551df6991adf82..4f3c9cbe8c42b169d7f0fe9c4a2487e0b8484fc2 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -186,8 +186,6 @@ usr/lib/collectd/ted.so
 usr/lib/collectd/thermal.so
 #usr/lib/collectd/threshold.la
 usr/lib/collectd/threshold.so
-#usr/lib/collectd/turbostat.la
-usr/lib/collectd/turbostat.so
 #usr/lib/collectd/ubi.la
 usr/lib/collectd/ubi.so
 #usr/lib/collectd/unixsock.la

diff --git a/config/rootfiles/common/x86_64/collectd b/config/rootfiles/common/x86_64/collectd
new file mode 100644 (file)
index 0000000..26976dc
--- /dev/null
+++ b/config/rootfiles/common/x86_64/collectd
@@ -0,0 +1,260 @@
+etc/collectd.conf
+#etc/collectd.d
+etc/collectd.d/info
+etc/collectd.precache
+etc/collectd.thermal
+etc/collectd.vpn
+etc/rc.d/rc0.d/K50collectd
+etc/rc.d/rc3.d/S29collectd
+etc/rc.d/rc6.d/K50collectd
+#usr/bin/collectd-nagios
+#usr/bin/collectd-tg
+#usr/bin/collectdctl
+#usr/etc/collectd.conf
+#usr/include/collectd
+#usr/include/collectd/client.h
+#usr/include/collectd/lcc_features.h
+#usr/include/collectd/network.h
+#usr/include/collectd/network_buffer.h
+#usr/include/collectd/network_parse.h
+#usr/include/collectd/server.h
+#usr/include/collectd/types.h
+#usr/lib/collectd
+#usr/lib/collectd/aggregation.la
+usr/lib/collectd/aggregation.so
+#usr/lib/collectd/apache.la
+usr/lib/collectd/apache.so
+#usr/lib/collectd/apcups.la
+usr/lib/collectd/apcups.so
+#usr/lib/collectd/ascent.la
+usr/lib/collectd/ascent.so
+#usr/lib/collectd/buddyinfo.la
+usr/lib/collectd/buddyinfo.so
+#usr/lib/collectd/cgroups.la
+usr/lib/collectd/cgroups.so
+#usr/lib/collectd/check_uptime.la
+usr/lib/collectd/check_uptime.so
+#usr/lib/collectd/chrony.la
+usr/lib/collectd/chrony.so
+#usr/lib/collectd/conntrack.la
+usr/lib/collectd/conntrack.so
+#usr/lib/collectd/contextswitch.la
+usr/lib/collectd/contextswitch.so
+#usr/lib/collectd/cpu.la
+usr/lib/collectd/cpu.so
+#usr/lib/collectd/cpufreq.la
+usr/lib/collectd/cpufreq.so
+#usr/lib/collectd/cpusleep.la
+usr/lib/collectd/cpusleep.so
+#usr/lib/collectd/curl.la
+usr/lib/collectd/curl.so
+#usr/lib/collectd/curl_xml.la
+usr/lib/collectd/curl_xml.so
+#usr/lib/collectd/df.la
+usr/lib/collectd/df.so
+#usr/lib/collectd/disk.la
+usr/lib/collectd/disk.so
+#usr/lib/collectd/dns.la
+usr/lib/collectd/dns.so
+#usr/lib/collectd/dpdk_telemetry.la
+usr/lib/collectd/dpdk_telemetry.so
+#usr/lib/collectd/drbd.la
+usr/lib/collectd/drbd.so
+#usr/lib/collectd/email.la
+usr/lib/collectd/email.so
+#usr/lib/collectd/entropy.la
+usr/lib/collectd/entropy.so
+#usr/lib/collectd/ethstat.la
+usr/lib/collectd/ethstat.so
+#usr/lib/collectd/exec.la
+usr/lib/collectd/exec.so
+#usr/lib/collectd/fhcount.la
+usr/lib/collectd/fhcount.so
+#usr/lib/collectd/filecount.la
+usr/lib/collectd/filecount.so
+#usr/lib/collectd/fscache.la
+usr/lib/collectd/fscache.so
+#usr/lib/collectd/hddtemp.la
+usr/lib/collectd/hddtemp.so
+#usr/lib/collectd/hugepages.la
+usr/lib/collectd/hugepages.so
+#usr/lib/collectd/infiniband.la
+usr/lib/collectd/infiniband.so
+#usr/lib/collectd/interface.la
+usr/lib/collectd/interface.so
+#usr/lib/collectd/ipc.la
+usr/lib/collectd/ipc.so
+#usr/lib/collectd/iptables.la
+usr/lib/collectd/iptables.so
+#usr/lib/collectd/irq.la
+usr/lib/collectd/irq.so
+#usr/lib/collectd/load.la
+usr/lib/collectd/load.so
+#usr/lib/collectd/logfile.la
+usr/lib/collectd/logfile.so
+#usr/lib/collectd/logparser.la
+usr/lib/collectd/logparser.so
+#usr/lib/collectd/madwifi.la
+usr/lib/collectd/madwifi.so
+#usr/lib/collectd/match_empty_counter.la
+usr/lib/collectd/match_empty_counter.so
+#usr/lib/collectd/match_hashed.la
+usr/lib/collectd/match_hashed.so
+#usr/lib/collectd/match_regex.la
+usr/lib/collectd/match_regex.so
+#usr/lib/collectd/match_timediff.la
+usr/lib/collectd/match_timediff.so
+#usr/lib/collectd/match_value.la
+usr/lib/collectd/match_value.so
+#usr/lib/collectd/mcelog.la
+usr/lib/collectd/mcelog.so
+#usr/lib/collectd/md.la
+usr/lib/collectd/md.so
+#usr/lib/collectd/mdevents.la
+usr/lib/collectd/mdevents.so
+#usr/lib/collectd/memory.la
+usr/lib/collectd/memory.so
+#usr/lib/collectd/network.la
+usr/lib/collectd/network.so
+#usr/lib/collectd/nfs.la
+usr/lib/collectd/nfs.so
+#usr/lib/collectd/notify_nagios.la
+usr/lib/collectd/notify_nagios.so
+#usr/lib/collectd/ntpd.la
+usr/lib/collectd/ntpd.so
+#usr/lib/collectd/numa.la
+usr/lib/collectd/numa.so
+#usr/lib/collectd/nut.la
+usr/lib/collectd/nut.so
+#usr/lib/collectd/olsrd.la
+usr/lib/collectd/olsrd.so
+#usr/lib/collectd/openldap.la
+usr/lib/collectd/openldap.so
+#usr/lib/collectd/openvpn.la
+usr/lib/collectd/openvpn.so
+#usr/lib/collectd/pcie_errors.la
+usr/lib/collectd/pcie_errors.so
+#usr/lib/collectd/ping.la
+usr/lib/collectd/ping.so
+#usr/lib/collectd/powerdns.la
+usr/lib/collectd/powerdns.so
+#usr/lib/collectd/processes.la
+usr/lib/collectd/processes.so
+#usr/lib/collectd/protocols.la
+usr/lib/collectd/protocols.so
+#usr/lib/collectd/python.la
+usr/lib/collectd/python.so
+#usr/lib/collectd/rrdcached.la
+usr/lib/collectd/rrdcached.so
+#usr/lib/collectd/rrdtool.la
+usr/lib/collectd/rrdtool.so
+#usr/lib/collectd/sensors.la
+usr/lib/collectd/sensors.so
+#usr/lib/collectd/snmp_agent.la
+usr/lib/collectd/snmp_agent.so
+#usr/lib/collectd/statsd.la
+usr/lib/collectd/statsd.so
+#usr/lib/collectd/swap.la
+usr/lib/collectd/swap.so
+#usr/lib/collectd/synproxy.la
+usr/lib/collectd/synproxy.so
+#usr/lib/collectd/syslog.la
+usr/lib/collectd/syslog.so
+#usr/lib/collectd/table.la
+usr/lib/collectd/table.so
+#usr/lib/collectd/tail.la
+usr/lib/collectd/tail.so
+#usr/lib/collectd/tail_csv.la
+usr/lib/collectd/tail_csv.so
+#usr/lib/collectd/target_notification.la
+usr/lib/collectd/target_notification.so
+#usr/lib/collectd/target_replace.la
+usr/lib/collectd/target_replace.so
+#usr/lib/collectd/target_scale.la
+usr/lib/collectd/target_scale.so
+#usr/lib/collectd/target_set.la
+usr/lib/collectd/target_set.so
+#usr/lib/collectd/target_v5upgrade.la
+usr/lib/collectd/target_v5upgrade.so
+#usr/lib/collectd/tcpconns.la
+usr/lib/collectd/tcpconns.so
+#usr/lib/collectd/teamspeak2.la
+usr/lib/collectd/teamspeak2.so
+#usr/lib/collectd/ted.la
+usr/lib/collectd/ted.so
+#usr/lib/collectd/thermal.la
+usr/lib/collectd/thermal.so
+#usr/lib/collectd/threshold.la
+usr/lib/collectd/threshold.so
+#usr/lib/collectd/turbostat.la
+usr/lib/collectd/turbostat.so
+#usr/lib/collectd/ubi.la
+usr/lib/collectd/ubi.so
+#usr/lib/collectd/unixsock.la
+usr/lib/collectd/unixsock.so
+#usr/lib/collectd/uptime.la
+usr/lib/collectd/uptime.so
+#usr/lib/collectd/users.la
+usr/lib/collectd/users.so
+#usr/lib/collectd/uuid.la
+usr/lib/collectd/uuid.so
+#usr/lib/collectd/vmem.la
+usr/lib/collectd/vmem.so
+#usr/lib/collectd/wireless.la
+usr/lib/collectd/wireless.so
+#usr/lib/collectd/write_graphite.la
+usr/lib/collectd/write_graphite.so
+#usr/lib/collectd/write_http.la
+usr/lib/collectd/write_http.so
+#usr/lib/collectd/write_influxdb_udp.la
+usr/lib/collectd/write_influxdb_udp.so
+#usr/lib/collectd/write_log.la
+usr/lib/collectd/write_log.so
+#usr/lib/collectd/write_sensu.la
+usr/lib/collectd/write_sensu.so
+#usr/lib/collectd/write_syslog.la
+usr/lib/collectd/write_syslog.so
+#usr/lib/collectd/write_tsdb.la
+usr/lib/collectd/write_tsdb.so
+#usr/lib/collectd/zfs_arc.la
+usr/lib/collectd/zfs_arc.so
+#usr/lib/collectd/zookeeper.la
+usr/lib/collectd/zookeeper.so
+#usr/lib/libcollectdclient.la
+usr/lib/libcollectdclient.so
+usr/lib/libcollectdclient.so.1
+usr/lib/libcollectdclient.so.1.1.0
+#usr/lib/perl5/site_perl/5.36.0/Collectd
+#usr/lib/perl5/site_perl/5.36.0/Collectd.pm
+#usr/lib/perl5/site_perl/5.36.0/Collectd/Plugins
+#usr/lib/perl5/site_perl/5.36.0/Collectd/Plugins/OpenVZ.pm
+#usr/lib/perl5/site_perl/5.36.0/Collectd/Unixsock.pm
+#usr/lib/perl5/site_perl/5.36.0/x86_64-linux-thread-multi/auto/Collectd
+#usr/lib/perl5/site_perl/5.36.0/x86_64-linux-thread-multi/auto/Collectd/.packlist
+#usr/lib/pkgconfig/libcollectdclient.pc
+usr/sbin/collectd
+usr/sbin/collectdmon
+#usr/share/collectd
+#usr/share/collectd/postgresql_default.conf
+usr/share/collectd/types.db
+#usr/share/man/man1/collectd-nagios.1
+#usr/share/man/man1/collectd-tg.1
+#usr/share/man/man1/collectd.1
+#usr/share/man/man1/collectdctl.1
+#usr/share/man/man1/collectdmon.1
+#usr/share/man/man3/Collectd::Unixsock.3
+#usr/share/man/man5/collectd-email.5
+#usr/share/man/man5/collectd-exec.5
+#usr/share/man/man5/collectd-java.5
+#usr/share/man/man5/collectd-lua.5
+#usr/share/man/man5/collectd-perl.5
+#usr/share/man/man5/collectd-python.5
+#usr/share/man/man5/collectd-snmp.5
+#usr/share/man/man5/collectd-threshold.5
+#usr/share/man/man5/collectd-unixsock.5
+#usr/share/man/man5/collectd.conf.5
+#usr/share/man/man5/types.db.5
+var/ipfire/collectd-migrate-4-to-5.pl
+var/ipfire/ovpn/collectd.vpn
+#var/lib/collectd
+etc/rc.d/init.d/collectd

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