From a446b6d544450122051e13074f1d874e0d03c64c Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 17 Dec 2012 14:10:04 -0600 Subject: runit-scripts: removed ldm, adding udevil. Also added log_care to 1 so that it runs on startup. This ensures that logs are cleaned up and rotated out of the way even if the system is offline when the cron job is supposed to run. refs #883 --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runitscripts/1 | 8 ++++++++ abs/core/runit-scripts/runitscripts/3 | 3 +++ abs/core/runit-scripts/runitscripts/services/ldm/run | 6 ------ abs/core/runit-scripts/runitscripts/services/udevil/log/run | 8 ++++++++ abs/core/runit-scripts/runitscripts/services/udevil/run | 6 ++++++ 6 files changed, 26 insertions(+), 7 deletions(-) delete mode 100644 abs/core/runit-scripts/runitscripts/services/ldm/run create mode 100755 abs/core/runit-scripts/runitscripts/services/udevil/log/run create mode 100644 abs/core/runit-scripts/runitscripts/services/udevil/run diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 870fe71..7750289 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=92 +pkgrel=99 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/1 b/abs/core/runit-scripts/runitscripts/1 index 0cb8307..9463e60 100755 --- a/abs/core/runit-scripts/runitscripts/1 +++ b/abs/core/runit-scripts/runitscripts/1 @@ -23,6 +23,14 @@ stat_done /usr/sbin/ethtool -s eth0 wol g 2>/dev/null /usr/sbin/ethtool -s eth1 wol g 2>/dev/null /usr/sbin/ethtool -s eth2 wol g 2>/dev/null +#cleanup of log files +if [ -f /etc/cron.daily/log_care ] +then + stat_busy "Cleaning up old logs" + /etc/cron.daily/log_care 2>/dev/null >/dev/null & + stat_done +fi + #user added stuff for level 1 of runit if [ -e /etc/runit/1.local ] then diff --git a/abs/core/runit-scripts/runitscripts/3 b/abs/core/runit-scripts/runitscripts/3 index aadab51..1a4b384 100755 --- a/abs/core/runit-scripts/runitscripts/3 +++ b/abs/core/runit-scripts/runitscripts/3 @@ -18,5 +18,8 @@ then /etc/runit/3.local stat_done fi +/usr/sbin/ethtool -s eth0 wol g 2>/dev/null +/usr/sbin/ethtool -s eth1 wol g 2>/dev/null +/usr/sbin/ethtool -s eth2 wol g 2>/dev/null /etc/rc.shutdown diff --git a/abs/core/runit-scripts/runitscripts/services/ldm/run b/abs/core/runit-scripts/runitscripts/services/ldm/run deleted file mode 100644 index 83e05b5..0000000 --- a/abs/core/runit-scripts/runitscripts/services/ldm/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions -stat_runit "starting ldm" -exec /usr/bin/ldm -u 1000 -g 1000 diff --git a/abs/core/runit-scripts/runitscripts/services/udevil/log/run b/abs/core/runit-scripts/runitscripts/services/udevil/log/run new file mode 100755 index 0000000..db4817f --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/udevil/log/run @@ -0,0 +1,8 @@ +#!/bin/sh +exec 2>&1 +#export TERM=linux +#. /etc/rc.conf +#. /etc/rc.d/functions +#stat_runit "Starting devmon logger" +/usr/bin/logger -p info -t udevil + diff --git a/abs/core/runit-scripts/runitscripts/services/udevil/run b/abs/core/runit-scripts/runitscripts/services/udevil/run new file mode 100644 index 0000000..46f922c --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/udevil/run @@ -0,0 +1,6 @@ +#!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "starting udevil" +exec /usr/bin/devmon -g -- cgit v0.12