5 files changed, 15 insertions, 21 deletions
diff --git a/meta-yerba/recipes-core/runit/runit-config.bb b/meta-yerba/recipes-core/runit/runit-config.bb
index d5a0c6c..1ad9251 100644
--- a/meta-yerba/recipes-core/runit/runit-config.bb
+++ b/meta-yerba/recipes-core/runit/runit-config.bb
@@ -7,9 +7,9 @@ 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 -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"
+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/1 b/meta-yerba/recipes-core/runit/runit-config/1
index e69de29..cb50ea9 100644
--- a/meta-yerba/recipes-core/runit/runit-config/1
+++ b/meta-yerba/recipes-core/runit/runit-config/1
@@ -0,0 +1,4 @@
+#!/bin/sh
+export PATH=/usr/bin:/bin:/sbin
+mount -a
+hostname -F /etc/hostname 2>/dev/null || hostname yerba-live
diff --git a/meta-yerba/recipes-core/runit/runit-config/2 b/meta-yerba/recipes-core/runit/runit-config/2
index e69de29..26a5842 100644
--- a/meta-yerba/recipes-core/runit/runit-config/2
+++ b/meta-yerba/recipes-core/runit/runit-config/2
@@ -0,0 +1,3 @@
+#!/bin/sh
+export PATH=/usr/bin:/bin:/sbin
+exec runsvdir /etc/service
diff --git a/meta-yerba/recipes-core/runit/runit-config/3 b/meta-yerba/recipes-core/runit/runit-config/3
index e69de29..43e2ad1 100644
--- a/meta-yerba/recipes-core/runit/runit-config/3
+++ b/meta-yerba/recipes-core/runit/runit-config/3
@@ -0,0 +1,2 @@
+#!/bin/sh
+# this is the shutdown thing i think? nothing here yet
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 8d27e44..8256a97 100644
--- a/meta-yerba/recipes-core/runit/runit_2.3.1.bb
+++ b/meta-yerba/recipes-core/runit/runit_2.3.1.bb
@@ -32,25 +32,10 @@ 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
-    fi
-    
-    cat > ${D}/etc/runit/1 << 'EOF'
-#!/bin/sh
-echo "Starting runit stage 1"
-EOF
-    cat > ${D}/etc/runit/2 << 'EOF'
-#!/bin/sh
-echo "Starting runit stage 2"
-exec runsvdir -P /etc/service
-EOF
-    cat > ${D}/etc/runit/3 << 'EOF'
-#!/bin/sh
-echo "Shutting down runit stage 3"
-EOF
-    chmod 0755 ${D}/etc/runit/* 2>/dev/null || true
+    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"
+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"
 
 PROVIDES += "runit-init"