aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/runit-services/README10
-rw-r--r--system/runit-services/runit-services.SlackBuild9
-rw-r--r--system/runit-services/runit-services.info6
3 files changed, 16 insertions, 9 deletions
diff --git a/system/runit-services/README b/system/runit-services/README
index 8def46259e659..680f20aa40a5a 100644
--- a/system/runit-services/README
+++ b/system/runit-services/README
@@ -5,7 +5,11 @@ The services are installed in /etc/sv.
To enable a service, simply symlink it to your service directory, ie,
/service or /var/service.
-Service logging is done via runit's svlogd or via syslog
-as applicable.
+The default service directory is assumed to be /service.
+If its different, RUNITSVDIR can be set while executing the Slackbuild, ie:
+
+# RUNITSVDIR=/var/service ./runit-services.Slackbuild
+
+Service logging is done via runit's svlogd or via syslog as applicable.
+tai64nlocal from daemontools is recommended for checking log timestamps.
-Check the project homepage for more information.
diff --git a/system/runit-services/runit-services.SlackBuild b/system/runit-services/runit-services.SlackBuild
index 521c6ae0dea4e..b44e068d80597 100644
--- a/system/runit-services/runit-services.SlackBuild
+++ b/system/runit-services/runit-services.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=runit-services
-VERSION=${VERSION:-20191015}
+VERSION=${VERSION:-20191026}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -51,11 +51,14 @@ find -L . \
# Install
make install DESTDIR="$PKG"
+if [ "${RUNITSVDIR:-/service}" != '/service' ]; then
+ make update-config DESTDIR="$PKG" RUNITSVDIR="$RUNITSVDIR"
+fi
# Fix some things
# ntp user does not exist in 14.2
-sed -i 's/ntp:daemon/daemon:adm/' -i "${PKG}/etc/sv/ntpd/log/conf"
-echo "NTPD_USER=root # for slack 14.2" >> "${PKG}/etc/sv/ntpd/conf"
+sed 's/ntp:daemon/daemon:adm/' -i "${PKG}/etc/sv/ntpd/log/conf"
+sed 's/ntp:ntp/root:root/' -i "${PKG}/etc/sv/ntpd/conf"
# Backup config files
find -L "${PKG}/etc/sv" -type f -name conf -exec mv {} {}.new \;
diff --git a/system/runit-services/runit-services.info b/system/runit-services/runit-services.info
index 168d7b0f57685..2707d2feae83a 100644
--- a/system/runit-services/runit-services.info
+++ b/system/runit-services/runit-services.info
@@ -1,8 +1,8 @@
PRGNAM="runit-services"
-VERSION="20191015"
+VERSION="20191026"
HOMEPAGE="https://github.com/aadityabagga/runit-services"
-DOWNLOAD="https://github.com/aadityabagga/runit-services/archive/20191015/runit-services-20191015.tar.gz"
-MD5SUM="5a052a633e6a3908fcfb33a6816ce19a"
+DOWNLOAD="https://github.com/aadityabagga/runit-services/archive/20191026/runit-services-20191026.tar.gz"
+MD5SUM="385c9b879b56aadd61d54d6e9b8dac9f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="runit pause"