diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2008-12-01 04:57:50 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2008-12-01 04:57:50 (GMT) |
| commit | d615d8fb4dd78b2e51708b321ad77b6304458bfd (patch) | |
| tree | ee1585afa44494632f0ebbee7c11e8c6ddf4fb52 /abs/core-testing/runit-scripts | |
| parent | e4e922e8206bce66217e08b678b10465036dd44c (diff) | |
| parent | 982eaa1f1285ed3cb1022ec9520d1d6387b62e64 (diff) | |
| download | linhes_pkgbuild-d615d8fb4dd78b2e51708b321ad77b6304458bfd.zip linhes_pkgbuild-d615d8fb4dd78b2e51708b321ad77b6304458bfd.tar.gz linhes_pkgbuild-d615d8fb4dd78b2e51708b321ad77b6304458bfd.tar.bz2 | |
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/runit-scripts')
6 files changed, 9 insertions, 9 deletions
diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD index 7d68dd4..2b60fba 100755 --- a/abs/core-testing/runit-scripts/PKGBUILD +++ b/abs/core-testing/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=1.8.0 -pkgrel=5 +pkgrel=14 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core-testing/runit-scripts/runit.install b/abs/core-testing/runit-scripts/runit.install index 4652368..4b97199 100755 --- a/abs/core-testing/runit-scripts/runit.install +++ b/abs/core-testing/runit-scripts/runit.install @@ -23,8 +23,7 @@ fi post_install () { mkdir /var/service - ln -s /etc/sv/tty* /var/service - servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus portmap sshd" + servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus portmap sshd syslog-ng tty2 tty3" for i in $servicelist do ln -s /etc/sv/$i /var/service/$i diff --git a/abs/core-testing/runit-scripts/runitscripts/services/frontend/run b/abs/core-testing/runit-scripts/runitscripts/services/frontend/run index 50e0e03..12a787d 100755 --- a/abs/core-testing/runit-scripts/runitscripts/services/frontend/run +++ b/abs/core-testing/runit-scripts/runitscripts/services/frontend/run @@ -1,6 +1,6 @@ #!/bin/sh exec 2>&1 - grep -q nox /proc/cmdline + grep -qi nox /proc/cmdline STATUS=$? if [ $STATUS = 0 ] then diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish b/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish index 3545b07..754bca1 100755 --- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish +++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish @@ -1,12 +1,12 @@ #!/bin/bash -killall -9 lircd +killall -9 lircd 2>/dev/null rm -f /var/run/lirc*.pid +[ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime touch /etc/sv/lircd/.runtime/`date +%s` numfiles=`/usr/bin/file_time_offset.py -s4 -d/etc/sv/lircd/.runtime ` if [ $numfiles -gt 3 ] then - rm -f /etc/sv/lircd/.runtime/* - ls -la /etc/sv/lircd/.runtime/* + rm -f /etc/sv/lircd/.runtime/* 2>/dev/null sv stop lircd echo "lircd is not able to start, disabling it" fi diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run index 57b1b48..0adfdc1 100755 --- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run +++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run @@ -2,6 +2,7 @@ exec 2>&1 run_lircd2=false . /etc/systemconfig +[ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime function dvico_detect { diff --git a/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run b/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run index 97302f1..65e551c 100755 --- a/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run +++ b/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run @@ -1,3 +1,3 @@ #!/bin/sh -ntpdate pool.ntp.org -exec ntpd -n -p /var/run/ntpd.pid +/usr/bin/ntpdate pool.ntp.org +exec /usr/bin/ntpd -n -p /var/run/ntpd.pid |