diff options
-rwxr-xr-x | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
-rwxr-xr-x | abs/core-testing/runit-scripts/PKGBUILD | 2 | ||||
-rwxr-xr-x | abs/core-testing/runit-scripts/runit.install | 3 | ||||
-rwxr-xr-x | abs/core-testing/runit-scripts/runitscripts/services/frontend/run | 2 | ||||
-rwxr-xr-x | abs/core-testing/runit-scripts/runitscripts/services/lircd/finish | 3 | ||||
-rwxr-xr-x | abs/core-testing/runit/PKGBUILD | 2 | ||||
-rwxr-xr-x | abs/core-testing/runit/runit.install | 9 |
7 files changed, 7 insertions, 16 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index c7a2dbf..599ebe2 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=47 +pkgrel=48 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan hwd) diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD index 8a84258..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=10 +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 5224d70..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 syslog-ng" + 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 51c33bb..754bca1 100755 --- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish +++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish @@ -6,8 +6,7 @@ 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/PKGBUILD b/abs/core-testing/runit/PKGBUILD index 9890c74..c0863bb 100755 --- a/abs/core-testing/runit/PKGBUILD +++ b/abs/core-testing/runit/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit pkgver=1.8.0 -pkgrel=56 +pkgrel=57 pkgdesc="A replacement for sysvinit, and other init schemes, with service supervision" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core-testing/runit/runit.install b/abs/core-testing/runit/runit.install index 4652368..977841b 100755 --- a/abs/core-testing/runit/runit.install +++ b/abs/core-testing/runit/runit.install @@ -22,14 +22,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" - for i in $servicelist - do - ln -s /etc/sv/$i /var/service/$i - done - + mkdir /var/service ln -s /sbin/halt.script /sbin/halt ln -s /sbin/reboot.script /sbin/reboot ln -s /sbin/poweroff.script /sbin/poweroff |