From 81212e12f1ab2fd0364efa645e18d348565f2fc5 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 8 Mar 2023 18:47:33 +0100 Subject: [PATCH] package/profeth: persistent data in /var/lib, syslog.conf Split tmpfiles config in two, one for snmpd and one for profeth. Add logging and redirect profeth logs to /log/profinet.log with default log rotation. Signed-off-by: Joachim Wiberg --- board/common/rootfs/etc/syslog.d/.empty | 0 board/common/rootfs/etc/syslog.d/profeth.conf | 1 + board/common/rootfs/etc/tmpfiles.d/snmpd.conf | 1 + package/profeth/profeth.mk | 3 +-- package/profeth/tmpfiles.conf | 4 +--- .../skeleton/etc/finit.d/available/profeth.conf | 5 ++++- 6 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 board/common/rootfs/etc/syslog.d/.empty create mode 100644 board/common/rootfs/etc/syslog.d/profeth.conf create mode 100644 board/common/rootfs/etc/tmpfiles.d/snmpd.conf diff --git a/board/common/rootfs/etc/syslog.d/.empty b/board/common/rootfs/etc/syslog.d/.empty new file mode 100644 index 00000000..e69de29b diff --git a/board/common/rootfs/etc/syslog.d/profeth.conf b/board/common/rootfs/etc/syslog.d/profeth.conf new file mode 100644 index 00000000..ee5f074e --- /dev/null +++ b/board/common/rootfs/etc/syslog.d/profeth.conf @@ -0,0 +1 @@ +local7.* -/var/log/profinet.log diff --git a/board/common/rootfs/etc/tmpfiles.d/snmpd.conf b/board/common/rootfs/etc/tmpfiles.d/snmpd.conf new file mode 100644 index 00000000..6d464f71 --- /dev/null +++ b/board/common/rootfs/etc/tmpfiles.d/snmpd.conf @@ -0,0 +1 @@ +d /var/run/agentx - - - diff --git a/package/profeth/profeth.mk b/package/profeth/profeth.mk index 25374cb0..3f689e24 100644 --- a/package/profeth/profeth.mk +++ b/package/profeth/profeth.mk @@ -20,12 +20,11 @@ define PROFETH_INSTALL_EXTRA cp $(PROFETH_PKGDIR)/sysctl.conf $(TARGET_DIR)/etc/sysctl.d/profeth.conf cp $(PROFETH_PKGDIR)/set_profinet_leds $(TARGET_DIR)/usr/sbin/ cp $(PROFETH_PKGDIR)/set_network_parameters $(TARGET_DIR)/usr/sbin/ - mkdir -p $(TARGET_DIR)/etc/profeth mkdir -p $(TARGET_DIR)/etc/snmp mkdir -p $(TARGET_DIR)/etc/tmpfiles.d mkdir -p $(TARGET_DIR)/etc/default cp $(PROFETH_PKGDIR)/snmpd.conf $(TARGET_DIR)/etc/snmp/ - cp $(PROFETH_PKGDIR)/tmpfiles.conf $(TARGET_DIR)/etc/tmpfiles.d/snmpd.conf + cp $(PROFETH_PKGDIR)/tmpfiles.conf $(TARGET_DIR)/etc/tmpfiles.d/profeth.conf cp $(PROFETH_PKGDIR)/default $(TARGET_DIR)/etc/default/profeth endef PROFETH_TARGET_FINALIZE_HOOKS += PROFETH_INSTALL_EXTRA diff --git a/package/profeth/tmpfiles.conf b/package/profeth/tmpfiles.conf index 751b8e0e..3765fd45 100644 --- a/package/profeth/tmpfiles.conf +++ b/package/profeth/tmpfiles.conf @@ -1,3 +1 @@ -# For Net-SNMP -d /var/run/agentx - - - - +d /var/lib/profeth - - - diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/profeth.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/profeth.conf index aeb5ca91..e7d30018 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/profeth.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/profeth.conf @@ -1 +1,4 @@ -service [2345789] env:-/etc/default/profeth profeth -s infix -p /etc/profeth $PROFETH_ARGS -- PROFΞTH daemon +service if: [2345789] \ + log:prio:local7.info,tag:profeth \ + env:-/etc/default/profeth \ + profeth -s infix -p /var/lib/profeth $PROFETH_ARGS -- PROFΞTH daemon