3 files changed, 9 insertions, 8 deletions
diff --git a/meta-yerba/recipes-core/runit/runit-config.bb b/meta-yerba/recipes-core/runit/runit-config.bb
index 677d319..d8a45f0 100644
--- a/meta-yerba/recipes-core/runit/runit-config.bb
+++ b/meta-yerba/recipes-core/runit/runit-config.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 SRC_URI = "file://1 file://2 file://3"
 
 do_install() {
-    install -d ${D}/etc/runit ${D}/etc/service ${D}/sbin ${D}/etc/runit/sv ${D}/etc/sv
+    install -d ${D}/etc/runit ${D}/etc/service ${D}/etc/runit/sv ${D}/etc/sv
 
-    install -m 0755 ${WORKDIR}/1 ${D}/etc/runit/
-    install -m 0755 ${WORKDIR}/2 ${D}/etc/runit/
-    install -m 0755 ${WORKDIR}/3 ${D}/etc/runit/
+    install -m 0755 ${WORKDIR}/1 ${D}/etc/runit/1
+    install -m 0755 ${WORKDIR}/2 ${D}/etc/runit/2
+    install -m 0755 ${WORKDIR}/3 ${D}/etc/runit/3
 }
 
 FILES:${PN} = "/etc/runit /etc/service /etc/sv /etc/runit/1 /etc/runit/2 /etc/runit/3"
diff --git a/meta-yerba/recipes-core/runit/runit-config/2 b/meta-yerba/recipes-core/runit/runit-config/2
index 26a5842..c089fae 100644
--- a/meta-yerba/recipes-core/runit/runit-config/2
+++ b/meta-yerba/recipes-core/runit/runit-config/2
@@ -1,3 +1,3 @@
 #!/bin/sh
-export PATH=/usr/bin:/bin:/sbin
+export PATH=/usr/sbin:/usr/bin:/bin:/sbin
 exec runsvdir /etc/service
diff --git a/meta-yerba/recipes-core/runit/runit_2.3.1.bb b/meta-yerba/recipes-core/runit/runit_2.3.1.bb
index 8256a97..5615737 100644
--- a/meta-yerba/recipes-core/runit/runit_2.3.1.bb
+++ b/meta-yerba/recipes-core/runit/runit_2.3.1.bb
@@ -19,7 +19,7 @@ do_compile() {
 }
 
 do_install() {
-    install -d ${D}/sbin ${D}/usr/bin ${D}/usr/sbin ${D}/etc/runit ${D}/etc/service
+    install -d ${D}/sbin ${D}/usr/bin ${D}/usr/sbin
     
     if [ -d ${S}/command ]; then
         install -m 0755 ${S}/command/runit-init ${D}/sbin/
@@ -32,11 +32,12 @@ do_install() {
         install -m 0755 ${S}/command/runsvchdir ${D}/usr/sbin/
         ln -sf sbin/runit-init ${D}/sbin/init
         ln -sf /usr/sbin/runsv ${D}/sbin/runsv
+        ln -sf /usr/sbin/runsvdir ${D}/sbin/runsvdir
     fi    
 }
 
-FILES:${PN} = "/sbin/runit-init /usr/sbin/runsvdir /usr/bin/sv /usr/sbin/svlogd /etc/runit /etc/service /sbin/runit /sbin/init /usr/sbin/runsv /usr/sbin/runsvchdir /usr/bin/chpst /sbin/runsv"
-RDEPENDS:${PN} += "busybox"
+FILES:${PN} = "/sbin/runit-init /usr/sbin/runsvdir /usr/bin/sv /usr/sbin/svlogd /sbin/runit /sbin/init /usr/sbin/runsv /usr/sbin/runsvchdir /usr/bin/chpst /sbin/runsv /sbin/runsvdir"
+RDEPENDS:${PN} += "busybox runit-config"
 
 PROVIDES += "runit-init"