2 files changed, 27 insertions, 11 deletions
diff --git a/abs/core/runit/PKGBUILD b/abs/core/runit/PKGBUILD
index 23559c3..02bb41a 100644..100755
--- a/abs/core/runit/PKGBUILD
+++ b/abs/core/runit/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit
 pkgver=2.1.1
-pkgrel=7
+pkgrel=10
 pkgdesc="A replacement for sysvinit, and other init schemes, with service supervision"
 url="http://smarden.org/runit/"
 license=('BSD')
@@ -27,18 +27,18 @@ build() {
 }
 
 package() {
-  install -d $pkgdir/sbin/
+  install -d $pkgdir/usr/bin/
   install -d $pkgdir/usr/man/man8
-  install -m0755 $srcdir/add_service.sh $pkgdir/sbin
-  install -m0755 $srcdir/remove_service.sh $pkgdir/sbin
+  install -m0755 $srcdir/add_service.sh $pkgdir/usr/bin
+  install -m0755 $srcdir/remove_service.sh $pkgdir/usr/bin
 
   cd $srcdir/admin/$pkgname-$pkgver/src
   for i in `cat ../package/commands`; do
-    install -m0755 $i $pkgdir/sbin/
+    install -m0755 $i $pkgdir/usr/bin/
   done
   
-  install -m0755 svwaitup $pkgdir/sbin/
-  install -m0755 svwaitdown $pkgdir/sbin/
+  install -m0755 svwaitup $pkgdir/usr/bin/
+  install -m0755 svwaitdown $pkgdir/usr/bin/
   install -m0644 ../man/*.8 $pkgdir/usr/man/man8
   gzip -9 $pkgdir/usr/man/man8/*.8 || return 1
 
diff --git a/abs/core/runit/runit.install b/abs/core/runit/runit.install
index b62e94e..879f549 100755
--- a/abs/core/runit/runit.install
+++ b/abs/core/runit/runit.install
@@ -36,17 +36,33 @@ if [ ! -f /sbin/shutdown-init ] ; then
   fi
 fi
 
-if [ -e /sbin/reboot ] ; then
-  rm -f /sbin/reboot
-fi
+#if [ -e /sbin/reboot ] ; then
+  rm -f /sbin/re*
+  rm -f /usr/sbin/re*
+  
+  rm -f /sbin/powe*
+  rm -f /usr/sbin/power*
+  
+  rm -f /sbin/halt*
+  rm -f /usr/sbin/halt*
+  
+  
+  
+#fi
 
 if [ -e /sbin/poweroff ] ; then
   rm -f /sbin/poweroff
 fi
 
+
+
+
+
+
+
 }
 
-post_install () {
+apost_install () {
    [ -e /sbin/halt ] || ln -sf /sbin/halt.script /sbin/halt
    [ -e /sbin/reboot ] || ln -sf /sbin/reboot.script /sbin/reboot
    [ -e /sbin/poweroff ] ||  ln -sf /sbin/poweroff.script /sbin/poweroff