move the runit init scripts into their own package.

52 files changed, 94 insertions, 13 deletions

diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD
new file mode 100755
index 0000000..17758de
--- /dev/null
+++ b/abs/core-testing/runit-scripts/PKGBUILD
@@ -0,0 +1,28 @@
+pkgname=runit-scripts
+pkgver=1.8.0
+pkgrel=3
+pkgdesc="collection of startup scripts for runit"
+url="http://smarden.org/runit/"
+license="BSD"
+depends=('glibc' 'util-linux' 'initscripts' 'runit' )
+makedepends=()
+conflicts=()
+replaces=()
+backup=()
+install=runit.install
+source=()
+arch=('i686')
+
+build() {
+  rsync -a --exclude=.svn $startdir/runitscripts $startdir/src
+  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 -m0700 1 2 3 ctrlaltdel $startdir/pkg/etc/runit
+
+  install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin
+  rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv
+}
diff --git a/abs/core-testing/runit-scripts/runit.install b/abs/core-testing/runit-scripts/runit.install
new file mode 100755
index 0000000..4652368
--- /dev/null
+++ b/abs/core-testing/runit-scripts/runit.install
@@ -0,0 +1,57 @@
+# 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 () {
+ 
+ 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
+
+  ln -s /sbin/halt.script /sbin/halt
+  ln -s /sbin/reboot.script /sbin/reboot
+  ln -s /sbin/poweroff.script /sbin/poweroff
+  ln -s /sbin/halt-init /sbin/reboot.init
+  ln -s /sbin/halt-init /sbin/poweroff.init
+
+
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+
+post_upgrade(){
+  ln -s /sbin/halt.script /sbin/halt
+  ln -s /sbin/reboot.script /sbin/reboot
+  ln -s /sbin/poweroff.script /sbin/poweroff
+  ln -s /sbin/halt-init /sbin/reboot.init
+  ln -s /sbin/halt-init /sbin/poweroff.init
+
+}
+
+op=$1
+shift
+
+$op $*
diff --git a/abs/core-testing/runit/runitscripts/1 b/abs/core-testing/runit-scripts/runitscripts/1
index 748930f..748930f 100755
--- a/abs/core-testing/runit/runitscripts/1
+++ b/abs/core-testing/runit-scripts/runitscripts/1
diff --git a/abs/core-testing/runit/runitscripts/2 b/abs/core-testing/runit-scripts/runitscripts/2
index 079b644..079b644 100755
--- a/abs/core-testing/runit/runitscripts/2
+++ b/abs/core-testing/runit-scripts/runitscripts/2
diff --git a/abs/core-testing/runit/runitscripts/3 b/abs/core-testing/runit-scripts/runitscripts/3
index 0fa3abc..0fa3abc 100755
--- a/abs/core-testing/runit/runitscripts/3
+++ b/abs/core-testing/runit-scripts/runitscripts/3
diff --git a/abs/core-testing/runit/runitscripts/ctrlaltdel b/abs/core-testing/runit-scripts/runitscripts/ctrlaltdel
index 2550d3c..2550d3c 100755
--- a/abs/core-testing/runit/runitscripts/ctrlaltdel
+++ b/abs/core-testing/runit-scripts/runitscripts/ctrlaltdel
diff --git a/abs/core-testing/runit/runitscripts/halt-runit b/abs/core-testing/runit-scripts/runitscripts/halt-runit
index 7c07b05..7c07b05 100755
--- a/abs/core-testing/runit/runitscripts/halt-runit
+++ b/abs/core-testing/runit-scripts/runitscripts/halt-runit
diff --git a/abs/core-testing/runit/runitscripts/logger b/abs/core-testing/runit-scripts/runitscripts/logger
index 6888f6f..6888f6f 100755
--- a/abs/core-testing/runit/runitscripts/logger
+++ b/abs/core-testing/runit-scripts/runitscripts/logger
diff --git a/abs/core-testing/runit/runitscripts/reboot-runit b/abs/core-testing/runit-scripts/runitscripts/reboot-runit
index be831ec..be831ec 100755
--- a/abs/core-testing/runit/runitscripts/reboot-runit
+++ b/abs/core-testing/runit-scripts/runitscripts/reboot-runit
diff --git a/abs/core-testing/runit/runitscripts/services/Xvfb/finish b/abs/core-testing/runit-scripts/runitscripts/services/Xvfb/finish
index 14cd831..14cd831 100755
--- a/abs/core-testing/runit/runitscripts/services/Xvfb/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/Xvfb/finish
diff --git a/abs/core-testing/runit/runitscripts/services/Xvfb/run b/abs/core-testing/runit-scripts/runitscripts/services/Xvfb/run
index 823916d..823916d 100755
--- a/abs/core-testing/runit/runitscripts/services/Xvfb/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/Xvfb/run
diff --git a/abs/core-testing/runit/runitscripts/services/acpid/run b/abs/core-testing/runit-scripts/runitscripts/services/acpid/run
index daf9859..daf9859 100755
--- a/abs/core-testing/runit/runitscripts/services/acpid/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/acpid/run
diff --git a/abs/core-testing/runit/runitscripts/services/alsa-utils/finish b/abs/core-testing/runit-scripts/runitscripts/services/alsa-utils/finish
index d6f3897..d6f3897 100755
--- a/abs/core-testing/runit/runitscripts/services/alsa-utils/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/alsa-utils/finish
diff --git a/abs/core-testing/runit/runitscripts/services/alsa-utils/run b/abs/core-testing/runit-scripts/runitscripts/services/alsa-utils/run
index 17f5f99..17f5f99 100755
--- a/abs/core-testing/runit/runitscripts/services/alsa-utils/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/alsa-utils/run
diff --git a/abs/core-testing/runit/runitscripts/services/apache/run b/abs/core-testing/runit-scripts/runitscripts/services/apache/run
index 130d870..130d870 100755
--- a/abs/core-testing/runit/runitscripts/services/apache/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/apache/run
diff --git a/abs/core-testing/runit/runitscripts/services/avahi/run b/abs/core-testing/runit-scripts/runitscripts/services/avahi/run
index 323d242..323d242 100755
--- a/abs/core-testing/runit/runitscripts/services/avahi/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/avahi/run
diff --git a/abs/core-testing/runit/runitscripts/services/cron/run b/abs/core-testing/runit-scripts/runitscripts/services/cron/run
index 99dc014..99dc014 100755
--- a/abs/core-testing/runit/runitscripts/services/cron/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/cron/run
diff --git a/abs/core-testing/runit/runitscripts/services/dbus/run b/abs/core-testing/runit-scripts/runitscripts/services/dbus/run
index 872ca77..872ca77 100755
--- a/abs/core-testing/runit/runitscripts/services/dbus/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/dbus/run
diff --git a/abs/core-testing/runit/runitscripts/services/dnsmasq/run b/abs/core-testing/runit-scripts/runitscripts/services/dnsmasq/run
index 451dda4..451dda4 100755
--- a/abs/core-testing/runit/runitscripts/services/dnsmasq/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/dnsmasq/run
diff --git a/abs/core-testing/runit/runitscripts/services/evrouter/finish b/abs/core-testing/runit-scripts/runitscripts/services/evrouter/finish
index 0dd33de..0dd33de 100755
--- a/abs/core-testing/runit/runitscripts/services/evrouter/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/evrouter/finish
diff --git a/abs/core-testing/runit/runitscripts/services/evrouter/run b/abs/core-testing/runit-scripts/runitscripts/services/evrouter/run
index 1d7389a..1d7389a 100755
--- a/abs/core-testing/runit/runitscripts/services/evrouter/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/evrouter/run
diff --git a/abs/core-testing/runit/runitscripts/services/frontend/finish b/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish
index e1e3e00..e1e3e00 100755
--- a/abs/core-testing/runit/runitscripts/services/frontend/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish
diff --git a/abs/core-testing/runit/runitscripts/services/frontend/log/run b/abs/core-testing/runit-scripts/runitscripts/services/frontend/log/run
index 463045f..463045f 100755
--- a/abs/core-testing/runit/runitscripts/services/frontend/log/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/frontend/log/run
diff --git a/abs/core-testing/runit/runitscripts/services/frontend/run b/abs/core-testing/runit-scripts/runitscripts/services/frontend/run
index 50e0e03..50e0e03 100755
--- a/abs/core-testing/runit/runitscripts/services/frontend/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/frontend/run
diff --git a/abs/core-testing/runit/runitscripts/services/gpm/run b/abs/core-testing/runit-scripts/runitscripts/services/gpm/run
index 361fc43..361fc43 100755
--- a/abs/core-testing/runit/runitscripts/services/gpm/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/gpm/run
diff --git a/abs/core-testing/runit/runitscripts/services/hal/run b/abs/core-testing/runit-scripts/runitscripts/services/hal/run
index f1362b2..f1362b2 100755
--- a/abs/core-testing/runit/runitscripts/services/hal/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/hal/run
diff --git a/abs/core-testing/runit/runitscripts/services/hobbit-client/run b/abs/core-testing/runit-scripts/runitscripts/services/hobbit-client/run
index e45173d..e45173d 100755
--- a/abs/core-testing/runit/runitscripts/services/hobbit-client/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/hobbit-client/run
diff --git a/abs/core-testing/runit/runitscripts/services/hobbit/run b/abs/core-testing/runit-scripts/runitscripts/services/hobbit/run
index 24ad9fe..24ad9fe 100755
--- a/abs/core-testing/runit/runitscripts/services/hobbit/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/hobbit/run
diff --git a/abs/core-testing/runit/runitscripts/services/lcdd/run b/abs/core-testing/runit-scripts/runitscripts/services/lcdd/run
index df71bf8..df71bf8 100755
--- a/abs/core-testing/runit/runitscripts/services/lcdd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lcdd/run
diff --git a/abs/core-testing/runit/runitscripts/services/lighttpd/run b/abs/core-testing/runit-scripts/runitscripts/services/lighttpd/run
index 70cb0a5..70cb0a5 100755
--- a/abs/core-testing/runit/runitscripts/services/lighttpd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lighttpd/run
diff --git a/abs/core-testing/runit/runitscripts/services/lircd/finish b/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish
index 3545b07..3545b07 100755
--- a/abs/core-testing/runit/runitscripts/services/lircd/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish
diff --git a/abs/core-testing/runit/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
index 4457b37..4457b37 100755
--- a/abs/core-testing/runit/runitscripts/services/lircd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
diff --git a/abs/core-testing/runit/runitscripts/services/mysql/run b/abs/core-testing/runit-scripts/runitscripts/services/mysql/run
index 569230e..569230e 100755
--- a/abs/core-testing/runit/runitscripts/services/mysql/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/mysql/run
diff --git a/abs/core-testing/runit/runitscripts/services/mythbackend/log/run b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/log/run
index 6ed5184..6ed5184 100755
--- a/abs/core-testing/runit/runitscripts/services/mythbackend/log/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/log/run
diff --git a/abs/core-testing/runit/runitscripts/services/mythbackend/run b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run
index b33e2e4..b33e2e4 100755
--- a/abs/core-testing/runit/runitscripts/services/mythbackend/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run
diff --git a/abs/core-testing/runit/runitscripts/services/ncid/run b/abs/core-testing/runit-scripts/runitscripts/services/ncid/run
index 8a90707..8a90707 100755
--- a/abs/core-testing/runit/runitscripts/services/ncid/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/ncid/run
diff --git a/abs/core-testing/runit/runitscripts/services/ncidd/run b/abs/core-testing/runit-scripts/runitscripts/services/ncidd/run
index 6b032db..6b032db 100755
--- a/abs/core-testing/runit/runitscripts/services/ncidd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/ncidd/run
diff --git a/abs/core-testing/runit/runitscripts/services/netfs/finish b/abs/core-testing/runit-scripts/runitscripts/services/netfs/finish
index 43be94c..43be94c 100755
--- a/abs/core-testing/runit/runitscripts/services/netfs/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/netfs/finish
diff --git a/abs/core-testing/runit/runitscripts/services/netfs/run b/abs/core-testing/runit-scripts/runitscripts/services/netfs/run
index f2c0813..f2c0813 100755
--- a/abs/core-testing/runit/runitscripts/services/netfs/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/netfs/run
diff --git a/abs/core-testing/runit/runitscripts/services/nfsd/run b/abs/core-testing/runit-scripts/runitscripts/services/nfsd/run
index 6610fe9..6610fe9 100755
--- a/abs/core-testing/runit/runitscripts/services/nfsd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/nfsd/run
diff --git a/abs/core-testing/runit/runitscripts/services/nfslock/run b/abs/core-testing/runit-scripts/runitscripts/services/nfslock/run
index 0ec6f75..0ec6f75 100755
--- a/abs/core-testing/runit/runitscripts/services/nfslock/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/nfslock/run
diff --git a/abs/core-testing/runit/runitscripts/services/nmbd/run b/abs/core-testing/runit-scripts/runitscripts/services/nmbd/run
index 9aa27ec..9aa27ec 100755
--- a/abs/core-testing/runit/runitscripts/services/nmbd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/nmbd/run
diff --git a/abs/core-testing/runit/runitscripts/services/ntpd/run b/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run
index 97302f1..97302f1 100755
--- a/abs/core-testing/runit/runitscripts/services/ntpd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run
diff --git a/abs/core-testing/runit/runitscripts/services/oss/finish b/abs/core-testing/runit-scripts/runitscripts/services/oss/finish
index f929f39..f929f39 100755
--- a/abs/core-testing/runit/runitscripts/services/oss/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/oss/finish
diff --git a/abs/core-testing/runit/runitscripts/services/oss/run b/abs/core-testing/runit-scripts/runitscripts/services/oss/run
index 687de8f..687de8f 100755
--- a/abs/core-testing/runit/runitscripts/services/oss/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/oss/run
diff --git a/abs/core-testing/runit/runitscripts/services/portmap/run b/abs/core-testing/runit-scripts/runitscripts/services/portmap/run
index 561d65b..561d65b 100755
--- a/abs/core-testing/runit/runitscripts/services/portmap/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/portmap/run
diff --git a/abs/core-testing/runit/runitscripts/services/smbd/run b/abs/core-testing/runit-scripts/runitscripts/services/smbd/run
index af77dcb..af77dcb 100755
--- a/abs/core-testing/runit/runitscripts/services/smbd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/smbd/run
diff --git a/abs/core-testing/runit/runitscripts/services/sshd/run b/abs/core-testing/runit-scripts/runitscripts/services/sshd/run
index 0dd16ef..0dd16ef 100755
--- a/abs/core-testing/runit/runitscripts/services/sshd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/sshd/run
diff --git a/abs/core-testing/runit/runitscripts/services/syslog-ng/run b/abs/core-testing/runit-scripts/runitscripts/services/syslog-ng/run
index eb56ace..eb56ace 100755
--- a/abs/core-testing/runit/runitscripts/services/syslog-ng/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/syslog-ng/run
diff --git a/abs/core-testing/runit/runitscripts/services/tty2/run b/abs/core-testing/runit-scripts/runitscripts/services/tty2/run
index 3782aed..3782aed 100755
--- a/abs/core-testing/runit/runitscripts/services/tty2/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/tty2/run
diff --git a/abs/core-testing/runit/runitscripts/services/tty3/run b/abs/core-testing/runit-scripts/runitscripts/services/tty3/run
index ce66b0d..ce66b0d 100755
--- a/abs/core-testing/runit/runitscripts/services/tty3/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/tty3/run
diff --git a/abs/core-testing/runit/PKGBUILD b/abs/core-testing/runit/PKGBUILD
index b9ec5f9..9890c74 100755
--- a/abs/core-testing/runit/PKGBUILD
+++ b/abs/core-testing/runit/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit
 pkgver=1.8.0
-pkgrel=52
+pkgrel=56
 pkgdesc="A replacement for sysvinit, and other init schemes, with service supervision"
 url="http://smarden.org/runit/"
 license="BSD"
@@ -34,34 +34,30 @@ build() {
   install -m0755 $startdir/src/remove_service.sh $startdir/pkg/sbin
   install -m0755 $startdir/src/reboot.script $startdir/pkg/sbin
   install -m0755 $startdir/src/halt.script  $startdir/pkg/sbin
-install -m0755 $startdir/src/poweroff.script  $startdir/pkg/sbin
+  install -m0755 $startdir/src/poweroff.script  $startdir/pkg/sbin
 
   for i in `cat ../package/commands`; do
     install -m0755 $i $startdir/pkg/sbin/
   done
+  
   install -m0755 svwaitup $startdir/pkg/sbin/
   install -m0755 svwaitdown $startdir/pkg/sbin/
   install -m0644 ../man/*.8 $startdir/pkg/usr/man/man8
-  rsync -a --exclude=.svn $startdir/runitscripts $startdir/src
-  #cp -rp $startdir/runitscripts $startdir/src/
 
-  cd $startdir/src/runitscripts
+#  rsync -a --exclude=.svn $startdir/runitscripts $startdir/src
+#  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/runit/runsvdir
-  #install -d $startdir/pkg/etc/runit/runsvdir/default
-  #ln -s default $startdir/pkg/etc/runit/runsvdir/current
 
-  install -m0700 1 2 3 ctrlaltdel $startdir/pkg/etc/runit
+#  install -m0700 1 2 3 ctrlaltdel $startdir/pkg/etc/runit
+#  install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin
 
-  install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin
+ # install -d $startdir/pkg/etc/sv
+ # rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv
 
-  install -d $startdir/pkg/etc/sv
-  rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv
-  #cp -R services/* $startdir/pkg/etc/sv
   cd $startdir
   install -d $startdir/pkg/usr/bin