From 3b02b41b13c4ef47b6b3d4e2d0fbaa598e360fd2 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Fri, 27 Jun 2008 15:39:22 +0300
Subject: [PATCH] [runit] fixed to handle the case where pkg_djb_commanddir is
 $root$sbindir correctly

---
 base/runit/runit.conf | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/base/runit/runit.conf b/base/runit/runit.conf
index c18f1698d..bd9b4851a 100644
--- a/base/runit/runit.conf
+++ b/base/runit/runit.conf
@@ -18,17 +18,18 @@
 
 . $base/package/*/runit/djb-config admin $sbindir
 
-hook_add postmake 6 'pkg_runit_addservices'
-if ! pkginstalled daemontools; then
-hook_add postmake 7 ' \
-	[ "$pkg_djb_commanddir" ] && add_flist $pkg_djb_commanddir; \
-	[ "$pkg_djb_servicedir" ] && add_flist $pkg_djb_servicedir; \
-	[ "$pkg_djb_packagedir" ] && add_flist $pkg_djb_packagedir; '
-fi
+hook_add postmake 6 'pkg_runit_quirks'
 
-pkg_runit_addservices() {
+pkg_runit_quirks() {
 	local agettyargs speed
 
+	if ! pkginstalled daemontools; then
+		[ "$pkg_djb_commanddir" -a "$pkg_djb_commanddir" != "$root$sbindir" ] &&
+			add_flist $pkg_djb_commanddir;
+		[ "$pkg_djb_servicedir" ] && add_flist $pkg_djb_servicedir;
+		[ "$pkg_djb_packagedir" ] && add_flist $pkg_djb_packagedir;
+	fi
+
 	# main scripts and virtual consoles
 	# only if it is INIT
 if [ "$SDECFG_INIT" == "runit" ]; then
@@ -82,10 +83,10 @@ EOT
 	ln -snfv /etc/rc.d/init.d/system "$root/$sysconfdir/3.d/99system"
 
 	# init at /sbin
-	if [ ${pkg_djb_commanddir} != $root/$sbindir ]; then
+	if [ ${pkg_djb_commanddir} != $root$sbindir ]; then
 		echo "Copying init files to /sbin..."
-		cp -vf $root$( readlink ${pkg_djb_commanddir}/runit ) $root/$sbindir/
-		cp -vf $root$( readlink ${pkg_djb_commanddir}/runit-init ) $root/$sbindir/init
+		cp -vf $root$( readlink ${pkg_djb_commanddir}/runit ) $root$sbindir/
+		cp -vf $root$( readlink ${pkg_djb_commanddir}/runit-init ) $root$sbindir/init
 	fi
 
 fi
@@ -126,5 +127,3 @@ else
 	hook_add postinstall 8 'sed -i -e "s,/service,/var/service,g" \
 		$root/lib/network/runit.sh'
 fi
-
-