summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--runit.service3
-rwxr-xr-xrunsvdir-start6
4 files changed, 7 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e233079a647..680f70b0c59d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = runit-systemd
pkgdesc = A service supervision scheme. This package is intended to be used alongside systemd.
pkgver = 2.1.2
- pkgrel = 1
+ pkgrel = 2
url = http://smarden.org/runit/
install = runit-systemd.install
arch = i686
@@ -16,11 +16,9 @@ pkgbase = runit-systemd
source = http://smarden.org/runit/runit-2.1.2.tar.gz
source = _sv
source = runit.service
- source = runsvdir-start
sha256sums = 6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18
sha256sums = c8f08a977595d16b8afd12e49048c061c483e4408bfa6f66e72af4a72d279e3d
- sha256sums = 7e80decf02cb72389ec88b4fcf60299e5604a717f9205b8ce3e474fa360d53c6
- sha256sums = d6df03f835301c165de8baac926f4650cb244d540f42d141f7025f808a9e98d1
+ sha256sums = aef4112bb48aedfbf60ed4e3bf89e5af7a7d5b673820f179b0801683118329b3
pkgname = runit-systemd
diff --git a/PKGBUILD b/PKGBUILD
index 168a87a23343..7650f9ee53d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
pkgname=runit-systemd
pkgver=2.1.2
-pkgrel=1
+pkgrel=2
pkgdesc="A service supervision scheme. This package is intended to be used alongside systemd."
url="http://smarden.org/runit/"
license=('BSD')
@@ -22,11 +22,10 @@ makedepends=('coreutils' 'sed')
provides=('runit')
conflicts=('runit')
install="runit-systemd.install"
-source=( http://smarden.org/runit/runit-$pkgver.tar.gz _sv runit.service runsvdir-start )
+source=( http://smarden.org/runit/runit-$pkgver.tar.gz _sv runit.service )
sha256sums=('6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18'
'c8f08a977595d16b8afd12e49048c061c483e4408bfa6f66e72af4a72d279e3d'
- '7e80decf02cb72389ec88b4fcf60299e5604a717f9205b8ce3e474fa360d53c6'
- 'd6df03f835301c165de8baac926f4650cb244d540f42d141f7025f808a9e98d1')
+ 'aef4112bb48aedfbf60ed4e3bf89e5af7a7d5b673820f179b0801683118329b3')
prepare() {
cd "$srcdir/admin/runit-$pkgver/src"
@@ -62,7 +61,6 @@ package() {
install -Dm644 "$srcdir/_sv" "$pkgdir/usr/share/zsh/site-functions/_sv"
install -Dm644 "$srcdir/runit.service" "$pkgdir/usr/lib/systemd/system/runit.service"
- install -Dm755 "$srcdir/runsvdir-start" "$pkgdir/usr/bin"
}
# vim:set ts=2 sw=2 et:
diff --git a/runit.service b/runit.service
index f6bf9a188723..01f370264082 100644
--- a/runit.service
+++ b/runit.service
@@ -3,7 +3,8 @@ Description=Runit service supervision
Documentation=http://smarden.org/runit/
[Service]
-ExecStart=/usr/bin/runsvdir-start
+Environment="PATH=/usr/local/sbin:/usr/local/bin:/usr/bin"
+ExecStart=/usr/bin/runsvdir -P /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
KillSignal=SIGHUP
KillMode=process
Restart=always
diff --git a/runsvdir-start b/runsvdir-start
deleted file mode 100755
index 6d0cfff76a34..000000000000
--- a/runsvdir-start
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-PATH="/usr/local/sbin:/usr/local/bin:/usr/bin"
-
-exec env - PATH=$PATH \
-runsvdir -P /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'