Merge branch 'testing'

5 files changed, 29 insertions, 17 deletions

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 1f1b02f..b652cba 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=8.0
-pkgrel=1
+pkgrel=6
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
@@ -14,19 +14,22 @@ source=(fbsplash-runit.sh)
 arch=('i686' 'x86_64')
 
 build() {
-  rsync -a --exclude=.svn --exclude=*~ $startdir/runitscripts $startdir/src
-  cd $startdir/src/runitscripts
-  install -d $startdir/pkg/etc/
-  install -d $startdir/pkg/etc/runit/
-  install -d $startdir/pkg/etc/sv
-  install -d $startdir/pkg/sbin
-  install -d $startdir/pkg/etc/rc.d/functions.d
+  rsync -a --exclude=.svn --exclude=*~ $startdir/runitscripts $srcdir
+}
+
+package() {
+  cd $srcdir/runitscripts
+  install -d $pkgdir/etc/
+  install -d $pkgdir/etc/runit/
+  install -d $pkgdir/etc/sv
+  install -d $pkgdir/sbin
+  install -d $pkgdir/etc/rc.d/functions.d
 
-  install -m0700 1 2 3 1.local 3.local ctrlaltdel $startdir/pkg/etc/runit
-  install -m755 $startdir/src/fbsplash-runit.sh $startdir/pkg/etc/rc.d/functions.d/fbsplash-runit.sh
-  install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin
-  rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv
-  chmod -R  755 $startdir/pkg/etc/sv
-  chown -R root:root $startdir/pkg/etc/sv
+  install -m0700 1 2 3 1.local 3.local ctrlaltdel $pkgdir/etc/runit
+  install -m755 $srcdir/fbsplash-runit.sh $pkgdir/etc/rc.d/functions.d/fbsplash-runit.sh
+  install -m0755 reboot-runit halt-runit logger $pkgdir/sbin
+  rsync -a --exclude=.svn services/* $pkgdir/etc/sv
+  chmod -R  755 $pkgdir/etc/sv
+  chown -R root:root $pkgdir/etc/sv
 }
 md5sums=('c79246677d5ffe687bcf6df1b9c2abc2')
diff --git a/abs/core/runit-scripts/runitscripts/halt-runit b/abs/core/runit-scripts/runitscripts/halt-runit
index b7d9a95..ac0862c 100755
--- a/abs/core/runit-scripts/runitscripts/halt-runit
+++ b/abs/core/runit-scripts/runitscripts/halt-runit
@@ -1,3 +1,3 @@
 #!/bin/sh
-wall "System will shutdown NOW"
+echo "System will shutdown NOW" | wall
 runit-init 0
diff --git a/abs/core/runit-scripts/runitscripts/reboot-runit b/abs/core/runit-scripts/runitscripts/reboot-runit
index 0d3d9d4..47ef728 100755
--- a/abs/core/runit-scripts/runitscripts/reboot-runit
+++ b/abs/core/runit-scripts/runitscripts/reboot-runit
@@ -1,3 +1,3 @@
 #!/bin/sh
-wall "System will reboot NOW"
+echo "System will reboot NOW" | wall
 runit-init 6
diff --git a/abs/core/runit-scripts/runitscripts/services/cron/run b/abs/core/runit-scripts/runitscripts/services/cron/run
index 3d358d3..bf5787a 100755
--- a/abs/core/runit-scripts/runitscripts/services/cron/run
+++ b/abs/core/runit-scripts/runitscripts/services/cron/run
@@ -6,4 +6,4 @@ stat_runit "Starting Cron"
 
 
 exec 2>&1
-exec /usr/sbin/crond -f -M /dev/null -l info
+exec /usr/sbin/crond -f -M /usr/bin/postfix -l info
diff --git a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
new file mode 100755
index 0000000..bc94a73
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
@@ -0,0 +1,9 @@
+#!/bin/sh
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting shellinabox"
+
+
+exec  su - mythtv -c "shellinaboxd -c /etc/lighttpd/ --no-beep"