diff -Nur -x '*.orig' -x '*.rej' e-smith-runit-1.0.0/root/etc/rc.d/init.d/daemontools mezzanine_patched_e-smith-runit-1.0.0/root/etc/rc.d/init.d/daemontools
--- e-smith-runit-1.0.0/root/etc/rc.d/init.d/daemontools	2007-02-16 12:11:45.000000000 -0700
+++ mezzanine_patched_e-smith-runit-1.0.0/root/etc/rc.d/init.d/daemontools	2007-02-16 12:11:16.000000000 -0700
@@ -20,7 +20,7 @@
 . /etc/rc.d/init.d/functions
 
 # The maximum amount of time to wait for a process to shut down, in seconds.
-WAITMAX=60
+SVWAIT=60
 
 start()
 {
@@ -29,7 +29,7 @@
     if [ -d $1/log ]; then
         dirs="$1/log $1"
     fi
-    /usr/bin/runsvctrl u $dirs
+    /usr/bin/sv start $dirs > /dev/null
     if [ $? -ne 0 ]; then
         failure "Starting $SERVICE"
     else
@@ -38,15 +38,10 @@
     /bin/echo
 }
 
-status()
-{
-    /usr/bin/runsvstat $1
-}
-
 stop()
 {
     /bin/echo -n "Stopping $SERVICE:"
-    /usr/bin/svwaitdown -t $WAITMAX $1
+    /usr/bin/sv stop $1 > /dev/null
     if [ $? -ne 0 ]; then
         failure "Stopping $SERVICE"
     else
@@ -67,8 +62,8 @@
     if [ -e log ]; then
         dirs="$dirs ./log"
     fi
-    /usr/bin/runsvctrl d $dirs
-    /usr/bin/runsvctrl x $dirs
+    /usr/bin/sv stop $dirs
+    /usr/bin/sv exit $dirs
     if [ $? -ne 0 ]; then
         failure "Disabling $SERVICE"
     else
@@ -80,48 +75,47 @@
 case $1 in
 
     restart)
-	action "Restarting $SERVICE" /usr/bin/runsvctrl t $SERVICE_DIR
-	/usr/bin/runsvctrl u $SERVICE_DIR
+	action "Restarting $SERVICE" /usr/bin/sv restart $SERVICE_DIR
             ;;
 
     sigalrm)
-	action "Sending ALRM signal to $SERVICE" /usr/bin/runsvctrl a $SERVICE_DIR
+	action "Sending ALRM signal to $SERVICE" /usr/bin/sv alarm $SERVICE_DIR
             ;;
 
     sigcont)
-	action "Sending CONT signal to $SERVICE" /usr/bin/runsvctrl c $SERVICE_DIR
+	action "Sending CONT signal to $SERVICE" /usr/bin/sv cont $SERVICE_DIR
             ;;
 
     sighup)
-	action "Sending HUP signal to $SERVICE" /usr/bin/runsvctrl h $SERVICE_DIR
+	action "Sending HUP signal to $SERVICE" /usr/bin/sv hup $SERVICE_DIR
             ;;
 
     sigusr1)
-	action "Sending USR1 signal to $SERVICE" /usr/bin/runsvctrl 1 $SERVICE_DIR
+	action "Sending USR1 signal to $SERVICE" /usr/bin/sv 1 $SERVICE_DIR
             ;;
 
     sigusr2)
-	action "Sending USR2 signal to $SERVICE" /usr/bin/runsvctrl 2 $SERVICE_DIR
+	action "Sending USR2 signal to $SERVICE" /usr/bin/sv 2 $SERVICE_DIR
             ;;
 
     sigint)
-	action "Sending INT signal to $SERVICE" /usr/bin/runsvctrl i $SERVICE_DIR
+	action "Sending INT signal to $SERVICE" /usr/bin/sv interrupt $SERVICE_DIR
             ;;
 
     sigkill)
-	action "Sending KILL signal to $SERVICE" /usr/bin/runsvctrl k $SERVICE_DIR
+	action "Sending KILL signal to $SERVICE" /usr/bin/sv kill $SERVICE_DIR
             ;;
 
     sigstop)
-	action "Sending STOP signal to $SERVICE" /usr/bin/runsvctrl p $SERVICE_DIR
+	action "Sending STOP signal to $SERVICE" /usr/bin/sv pause $SERVICE_DIR
             ;;
 
     sigterm|condrestart)
-	action "Sending TERM signal to $SERVICE" /usr/bin/runsvctrl t $SERVICE_DIR
+	action "Sending TERM signal to $SERVICE" /usr/bin/sv term $SERVICE_DIR
             ;;
 
     status)
-	/usr/bin/runsvstat $SERVICE_DIR
+	/usr/bin/sv status $SERVICE_DIR
             ;;
 
     start)