diff options
Diffstat (limited to 'abs/core/runit-scripts')
-rwxr-xr-x | abs/core/runit-scripts/PKGBUILD | 3 | ||||
-rwxr-xr-x | abs/core/runit-scripts/runit.install | 22 | ||||
-rwxr-xr-x | abs/core/runit-scripts/runitscripts/1 | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | abs/core/runit-scripts/runitscripts/services/bluetoothd/run | 6 | ||||
-rwxr-xr-x | abs/core/runit-scripts/runitscripts/services/irqbalance/run | 16 |
5 files changed, 23 insertions, 25 deletions
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 828e54c..4c3c8e1 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=25 +pkgrel=30 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" @@ -18,7 +18,6 @@ build() { cd $startdir/src/runitscripts install -d $startdir/pkg/etc/ install -d $startdir/pkg/etc/runit/ - install -d $startdir/pkg/var/service install -d $startdir/pkg/etc/sv install -d $startdir/pkg/sbin install -d $startdir/pkg/etc/rc.d/functions.d diff --git a/abs/core/runit-scripts/runit.install b/abs/core/runit-scripts/runit.install index 813d9f2..b98574f 100755 --- a/abs/core/runit-scripts/runit.install +++ b/abs/core/runit-scripts/runit.install @@ -1,29 +1,9 @@ # arg 1: the new package version -pre_install () { -if [ ! -f /sbin/halt-init ] -then - mv /sbin/halt /sbin/halt-init - rm -f /sbin/reboot - rm -f /sbin/poweroff -fi - -} - -pre_upgrade () { -if [ ! -f /sbin/halt-init ] -then - mv /sbin/halt /sbin/halt-init - rm -f /sbin/reboot - rm -f /sbin/poweroff -fi - -} - post_install () { [ -e /service ] || mkdir /service - servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus sshd syslog-ng tty2 tty3" + servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus sshd syslog-ng tty2 tty3" for i in $servicelist do ln -s /etc/sv/$i /service/$i diff --git a/abs/core/runit-scripts/runitscripts/1 b/abs/core/runit-scripts/runitscripts/1 index af6b376..c64a047 100755 --- a/abs/core/runit-scripts/runitscripts/1 +++ b/abs/core/runit-scripts/runitscripts/1 @@ -11,6 +11,7 @@ rm -f /etc/sv/frontend/.runtime/* 2>/dev/null rm -f /etc/runit/reboot 2>/dev/null /sbin/agetty -8 38400 tty10 linux & stat_busy "Starting network" +/bin/mkdir -p /var/lock/subsys /etc/net/scripts/network.init start 2>/var/log/network.init.error >/var/log/network.init stat_done /usr/sbin/ethtool -s eth0 wol g 2>/dev/null diff --git a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run index 7a92437..15d3bb2 100644..100755 --- a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run +++ b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run @@ -8,5 +8,7 @@ [ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth - stat_runit "Starting bluetooth subsystem:" - exec /usr/sbin/bluetoothd -n +/sbin/svwaitup -s 15 /service/dbus || exit 1 +stat_runit "Starting bluetooth subsystem:" + +exec /usr/sbin/bluetoothd -n >/dev/null diff --git a/abs/core/runit-scripts/runitscripts/services/irqbalance/run b/abs/core/runit-scripts/runitscripts/services/irqbalance/run new file mode 100755 index 0000000..6342868 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/irqbalance/run @@ -0,0 +1,16 @@ +#!/bin/bash + +# source application-specific settings +ONESHOT=0 +[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance + +if [ "$ONESHOT" -ne 0 ]; then + ONESHOT_CMD="--oneshot" +fi + +. /etc/rc.conf +. /etc/rc.d/functions + +stat_runit "Starting irqbalance" + +exec /usr/sbin/irqbalance --debug $ONESHOT_CMD >/dev/null |