summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core')
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/add_service.sh15
-rwxr-xr-xabs/core/LinHES-config/remove_service.sh8
-rwxr-xr-xabs/core/runit-scripts/PKGBUILD4
-rwxr-xr-xabs/core/runit-scripts/runit.install20
-rwxr-xr-xabs/core/runit-scripts/runitscripts/22
-rw-r--r--abs/core/runit/PKGBUILD6
-rwxr-xr-xabs/core/runit/add_service.sh2
-rwxr-xr-xabs/core/runit/remove_service.sh2
-rwxr-xr-xabs/core/runit/runit.install3
10 files changed, 29 insertions, 37 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index ef25620..9552089 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
-pkgver=2.1
-pkgrel=45
+pkgver=2.2
+pkgrel=1
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
diff --git a/abs/core/LinHES-config/add_service.sh b/abs/core/LinHES-config/add_service.sh
deleted file mode 100755
index 190d604..0000000
--- a/abs/core/LinHES-config/add_service.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-SERVICE_DIR=/var/service
-SCRIPT_DIR=/etc/sv
-if [ -d $SCRIPT_DIR/$1 ]
-then
- if [ -d $SERVICE_DIR/$1 ]
- then
- echo "$1 already there"
- else
- ln -s $SCRIPT_DIR/$1 $SERVICE_DIR/$1
- echo "adding $1"
- fi
-else
- echo "couldn't find $SCRIPT_DIR/$1"
-fi
diff --git a/abs/core/LinHES-config/remove_service.sh b/abs/core/LinHES-config/remove_service.sh
deleted file mode 100755
index 6cc4b4f..0000000
--- a/abs/core/LinHES-config/remove_service.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-SERVICE_DIR=/var/service
-SCRIPT_DIR=/etc/sv
-if [ -e $SERVICE_DIR/$1 ]
-then
- echo "removing"
- rm $SERVICE_DIR/$1
-fi
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 4fcc454..46c55b6 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
-pkgver=1.8.0
-pkgrel=121
+pkgver=2.1.1
+pkgrel=2
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runit.install b/abs/core/runit-scripts/runit.install
index 1e3f619..138d498 100755
--- a/abs/core/runit-scripts/runit.install
+++ b/abs/core/runit-scripts/runit.install
@@ -22,11 +22,11 @@ fi
post_install () {
- mkdir /var/service
+ [ -e /service ] || mkdir /service
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
+ ln -s /etc/sv/$i /service/$i
done
[ -e /sbin/halt ] || ln -s /sbin/halt.script /sbin/halt
@@ -48,6 +48,22 @@ post_upgrade(){
[ -e /sbin/poweroff ] || ln -s /sbin/poweroff.script /sbin/poweroff
[ -e /sbin/reboot.init ] || ln -s /sbin/halt-init /sbin/reboot.init
[ -e /sbin/poweroff.init ] || ln -s /sbin/halt-init /sbin/poweroff.init
+
+ if [ -e /var/service ]
+ then
+ if [ ! -e /service ]
+ then
+ mkdir /service
+ cd /var/service
+ for i in *
+ do
+ ln -s /etc/sv/$i /service/$i
+ done
+ fi
+
+ fi
+
+
}
op=$1
diff --git a/abs/core/runit-scripts/runitscripts/2 b/abs/core/runit-scripts/runitscripts/2
index 079b644..c1acfa0 100755
--- a/abs/core/runit-scripts/runitscripts/2
+++ b/abs/core/runit-scripts/runitscripts/2
@@ -5,4 +5,4 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin
#runsvchdir default >/dev/null
exec env - PATH=$PATH \
-runsvdir -P /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+runsvdir -P /service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
diff --git a/abs/core/runit/PKGBUILD b/abs/core/runit/PKGBUILD
index 1dd2838..a3b202e 100644
--- a/abs/core/runit/PKGBUILD
+++ b/abs/core/runit/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit
pkgver=2.1.1
-pkgrel=1
+pkgrel=3
pkgdesc="A replacement for sysvinit, and other init schemes, with service supervision"
url="http://smarden.org/runit/"
license=('BSD')
@@ -64,8 +64,8 @@ package() {
}
md5sums=('8fa53ea8f71d88da9503f62793336bc3'
- '5828ac37537d60ded00252dc02d462c6'
- '984dbe096b0db26ad9f3f5b51addd9c9'
+ '8ee2bffb82e18ab6a10f01dc2cada38a'
+ 'e7845f7609459542e6c5fc024a9ef922'
'e347ea8cf2981f2cd4105111ea1ce1d4'
'263198ec006b87891ea0f3ab1d103086'
'3ec5f3013dcbd60b6b957d17ba220585'
diff --git a/abs/core/runit/add_service.sh b/abs/core/runit/add_service.sh
index 237af13..791639a 100755
--- a/abs/core/runit/add_service.sh
+++ b/abs/core/runit/add_service.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-SERVICE_DIR=/var/service
+SERVICE_DIR=/service
SCRIPT_DIR=/etc/sv
if [ -d $SCRIPT_DIR/$1 ]
then
diff --git a/abs/core/runit/remove_service.sh b/abs/core/runit/remove_service.sh
index 16c7ecf..349f5bb 100755
--- a/abs/core/runit/remove_service.sh
+++ b/abs/core/runit/remove_service.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-SERVICE_DIR=/var/service
+SERVICE_DIR=/service
SCRIPT_DIR=/etc/sv
if [ -e $SERVICE_DIR/$1 ]
then
diff --git a/abs/core/runit/runit.install b/abs/core/runit/runit.install
index 1728bc6..392d7be 100755
--- a/abs/core/runit/runit.install
+++ b/abs/core/runit/runit.install
@@ -27,7 +27,6 @@ fi
}
post_install () {
- mkdir /var/service
[ -e /sbin/halt ] || ln -s /sbin/halt.script /sbin/halt
[ -e /sbin/reboot ] || ln -s /sbin/reboot.script /sbin/reboot
[ -e /sbin/poweroff ] || ln -s /sbin/poweroff.script /sbin/poweroff
@@ -40,7 +39,7 @@ post_install () {
# arg 2: the old package version
post_upgrade(){
- /bin/true
+ post_install
}
op=$1