summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/runit-scripts/runitscripts/services
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core-testing/runit-scripts/runitscripts/services')
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/Xvfb/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/acpid/log/run8
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/acpid/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/apache/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/avahi/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/cron/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/dbus/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/dnsmasq/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/evrouter/run7
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/frontend/finish10
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/frontend/run9
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/gpm/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/hal/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/hobbit-client/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/hobbit/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/lcdd/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/lighttpd/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/lircd/finish6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/lircd/run28
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/mysql/run13
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/mythbackend/log/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/mythbackend/run8
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/ncid/run9
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/ncidd/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/nfsd/run7
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/nfslock/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/nmbd/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/ntpd/run11
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/oss/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/portmap/run4
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/smbd/run6
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/sshd/run5
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/syslog-ng/run7
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/tty2/run5
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/tty3/run4
35 files changed, 232 insertions, 23 deletions
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/Xvfb/run b/abs/core-testing/runit-scripts/runitscripts/services/Xvfb/run
index 823916d..71ffedd 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/Xvfb/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/Xvfb/run
@@ -1,5 +1,11 @@
#!/bin/bash
. /etc/profile
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting XVFB"
+
+
VIRTUAL_DISPLAY=":50"
Xvfb_parm="$VIRTUAL_DISPLAY -screen 0 800x600x16"
Xvfb $Xvfb_parm
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/acpid/log/run b/abs/core-testing/runit-scripts/runitscripts/services/acpid/log/run
new file mode 100755
index 0000000..20c892e
--- /dev/null
+++ b/abs/core-testing/runit-scripts/runitscripts/services/acpid/log/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+exec 2>&1
+#export TERM=linux
+#. /etc/rc.conf
+#. /etc/rc.d/functions
+#stat_runit "Starting MythBackend logger"
+/usr/bin/logger -p info -t acpid
+
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/acpid/run b/abs/core-testing/runit-scripts/runitscripts/services/acpid/run
index daf9859..bffb564 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/acpid/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/acpid/run
@@ -1,3 +1,7 @@
#!/bin/sh
exec 2>&1
-exec /usr/sbin/acpid -f -c /etc/acpi/events 2>/dev/null >/dev/null
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting acpid"
+exec /usr/sbin/acpid -f -c /etc/acpi/events
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/apache/run b/abs/core-testing/runit-scripts/runitscripts/services/apache/run
index 130d870..95d5cc4 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/apache/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/apache/run
@@ -1,2 +1,8 @@
#!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Apache"
+
+
exec /usr/local/apache/bin/httpd -DNO_DETACH
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/avahi/run b/abs/core-testing/runit-scripts/runitscripts/services/avahi/run
index 323d242..b9b4905 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/avahi/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/avahi/run
@@ -1,4 +1,10 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Avahi"
+
+
exec /usr/sbin/avahi-daemon >/dev/null 2>/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/cron/run b/abs/core-testing/runit-scripts/runitscripts/services/cron/run
index 99dc014..0894236 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/cron/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/cron/run
@@ -1,3 +1,9 @@
#!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Cron"
+
+
exec 2>&1
exec /usr/sbin/crond -f >/dev/null 2>/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/dbus/run b/abs/core-testing/runit-scripts/runitscripts/services/dbus/run
index 872ca77..a9af150 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/dbus/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/dbus/run
@@ -1,3 +1,9 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting dbus"
+
+
exec /usr/bin/dbus-daemon --system --nofork 2>/dev/null >/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/dnsmasq/run b/abs/core-testing/runit-scripts/runitscripts/services/dnsmasq/run
index 451dda4..f14c51a 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/dnsmasq/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/dnsmasq/run
@@ -1,4 +1,10 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting dns services"
+
+
exec /usr/sbin/dnsmasq -k >/dev/null 2>/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/evrouter/run b/abs/core-testing/runit-scripts/runitscripts/services/evrouter/run
index 5697f6f..56f7ae6 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/evrouter/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/evrouter/run
@@ -1,13 +1,20 @@
#!/bin/bash
. /etc/profile
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
which evrouter >/dev/null 2>/dev/null
if [ $? = 0 ]
then
+
+ stat_runit "Starting evrouter"
ps -ef |grep -v grep|grep -q "Xvfb :50"
if [ ! $? = 0 ]
then
sv start Xvfb
fi
+
su mythtv -c "DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*"
fi
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish b/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish
index a01326c..5b0bd5b 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish
@@ -1,13 +1,15 @@
#!/bin/bash
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
grep -q nox /proc/cmdline
STATUS=$?
if [ $STATUS = 0 ]
then
- chvt 2
+ chvt 2
else
-
- chvt 1
if [ ! -d /etc/sv/frontend/.runtime ]
then
mkdir -p /etc/sv/frontend/.runtime
@@ -21,6 +23,6 @@ else
then
sv stop frontend
rm -f /etc/sv/frontend/.runtime/*
- echo "Frontend is not able to start, disabling it" >/dev/tty1
+ printhl " Frontend is not able to start, disabling it."
fi
fi
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/frontend/run b/abs/core-testing/runit-scripts/runitscripts/services/frontend/run
index 72423da..c1e2f2d 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/frontend/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/frontend/run
@@ -1,4 +1,8 @@
#!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
exec 2>&1
grep -qi nox /proc/cmdline
STATUS=$?
@@ -9,6 +13,9 @@ exec 2>&1
fi
touch /var/log/fluxbox.log
chown mythtv:mythtv /var/log/fluxbox.log
-echo "Starting LinHES frontend" >/dev/tty1
+
+stat_runit "Starting LinHES frontend"
+
+#echo "Starting LinHES frontend" >/dev/tty1
exec /bin/su - mythtv -l -c /usr/LH/bin/LinHES-start
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/gpm/run b/abs/core-testing/runit-scripts/runitscripts/services/gpm/run
index 361fc43..c347c77 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/gpm/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/gpm/run
@@ -1,4 +1,10 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting GPM"
+
+
. /etc/sysconfig/mouse
exec gpm -D -m $MDEVICE -t $PROTOCOL
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/hal/run b/abs/core-testing/runit-scripts/runitscripts/services/hal/run
index f1362b2..a6d5c0e 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/hal/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/hal/run
@@ -1,4 +1,8 @@
#!/bin/sh
exec 2>&1
-sv waitup dbus 2>/dev/null 1>/dev/null
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+svwaitup dbus 2>/dev/null 1>/dev/null
+stat_runit "Starting Hal"
exec /usr/sbin/hald --daemon=no --use-syslog 2>/dev/null >/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/hobbit-client/run b/abs/core-testing/runit-scripts/runitscripts/services/hobbit-client/run
index e45173d..a28c6f8 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/hobbit-client/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/hobbit-client/run
@@ -1,4 +1,9 @@
#!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting hobbit client"
+
#----------------------------------------------------------------------------#
# Hobbit client bootup script. #
# #
@@ -64,5 +69,6 @@ MACHINE="`echo $MACHINEDOTS | sed -e 's/\./,/g'`"
export MACHINE MACHINEDOTS BBOSTYPE BBOSSCRIPT HOBBITCLIENTHOME CONFIGCLASS
+
su nobody -c "$HOBBITCLIENTHOME/bin/hobbitlaunch --config=$HOBBITCLIENTHOME/etc/clientlaunch.cfg --log=$HOBBITCLIENTHOME/logs/clientlaunch.log --pidfile=$HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid --no-daemon"
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/hobbit/run b/abs/core-testing/runit-scripts/runitscripts/services/hobbit/run
index 24ad9fe..d36243b 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/hobbit/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/hobbit/run
@@ -1,3 +1,9 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting hobbit server"
+
+
exec su nobody -c "/data/srv/hobbit/server/bin/hobbitlaunch --config=/data/srv/hobbit/server/etc/hobbitlaunch.cfg --env=/data/srv/hobbit/server/etc/hobbitserver.cfg --log=/var/log/hobbit/hobbitlaunch.log --pidfile=/var/log/hobbit/hobbitlaunch.pid --no-daemon"
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lcdd/run b/abs/core-testing/runit-scripts/runitscripts/services/lcdd/run
index df71bf8..da2258b 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/lcdd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lcdd/run
@@ -1,5 +1,11 @@
#!/bin/sh
. /etc/systemconfig
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting lcdproc"
+
+
exec 2>&1
if [ x$LCDtype = xxosd ]
then
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lighttpd/run b/abs/core-testing/runit-scripts/runitscripts/services/lighttpd/run
index 70cb0a5..798690c 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/lighttpd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lighttpd/run
@@ -1,2 +1,8 @@
#!/bin/bash
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting lighttpd"
+
+
exec /usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish b/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish
index 754bca1..1afc41c 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/finish
@@ -1,4 +1,8 @@
#!/bin/bash
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
killall -9 lircd 2>/dev/null
rm -f /var/run/lirc*.pid
[ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
@@ -8,5 +12,5 @@ if [ $numfiles -gt 3 ]
then
rm -f /etc/sv/lircd/.runtime/* 2>/dev/null
sv stop lircd
- echo "lircd is not able to start, disabling it"
+ printhl " lircd is not able to start, disabling it"
fi
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
index 373f04c..914f5cf 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
@@ -1,5 +1,9 @@
#!/bin/bash
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
#since what we do may not be enough
#if your one of those people, this is where you place your stuff
LOG=/tmp/lirc.log
@@ -10,9 +14,13 @@ fi
if [ -f /etc/runit/lirc.sh ]
then
#program must not terminate.
+
+ stat_runit "Starting lirc"
+
/etc/runit/lirc.sh
else
. /etc/systemconfig
+ stat_runit "Starting lirc"
[ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
function dvico_detect {
@@ -24,7 +32,7 @@ else
fi
}
- num_lirc=`ls -la /dev/lirc[0-9] |wc -l`
+ num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l `
num_lirc=$((num_lirc-1))
#/dev/ttys0 (COM1), port 0x3f8, irq 4
@@ -79,22 +87,27 @@ else
then
rmmod commandir 2>/dev/null
CMD="/usr/sbin/lircd -n --driver=commandir"
+ printhl " Using commandir"
+
$CMD >>$LOG 2>>$LOG
else
LASTCMD=""
for i in `seq 1 $num_lirc`
do
CMD="/usr/sbin/lircd -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
- echo $CMD
+# echo $CMD
+ printhl " Device $i"
$CMD >>$LOG 2>>$LOG
LASTCMD="--connect=localhost:876$i $LASTCMD "
done
if [ $RunDvico = "true" -a $num_lirc -lt 0 ]
then
- #only run dvicio
- LCMD="/usr/sbin/lircd -n -d /dev/usb/hiddev0 --driver=dvico --output /dev/lircd"
- # echo $LCMD
- exec $LCMD >>$LOG 2>>$LOG
+ #only run dvicio
+ LCMD="/usr/sbin/lircd -n -d /dev/usb/hiddev0 --driver=dvico --output /dev/lircd"
+ # echo $LCMD
+ printhl " Device Dvicio"
+
+ exec $LCMD >>$LOG 2>>$LOG
elif [ $RunDvico = true -a $num_lirc -gt -1 ]
then
#chain them together
@@ -103,10 +116,13 @@ else
# echo $CMD
$CMD >> $LOG
LASTCMD="--connect=localhost:876$i $LASTCMD "
+ printhl " Device Dvicio"
+
/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd $LASTCMD >>$LOG 2>>$LOG
else
LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd $LASTCMD"
# echo $LCMD
+
exec $LCMD >>$LOG 2>>$LOG
fi
fi
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/mysql/run b/abs/core-testing/runit-scripts/runitscripts/services/mysql/run
index bfb367f..6b2f95a 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/mysql/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/mysql/run
@@ -1,19 +1,23 @@
#!/bin/bash
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Mysql"
MYSQLD_ROOT="/data/srv/mysql"
# source application-specific settings
[ -f /etc/conf.d/mysqld ] && . /etc/conf.d/mysqld
if [ ! `egrep '^mysql:' /etc/group` ]; then
- stat_busy "Adding mysql group"
+ stat_runit "Adding mysql group"
groupadd -g 89 mysql
- stat_done
+
fi
if [ ! `egrep '^mysql:' /etc/passwd` ]; then
- stat_busy "Adding mysql user"
+ stat_runit "Adding mysql user"
useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql
[ -d $MYSQLD_ROOT ] && chown -R mysql.mysql $MYSQLD_ROOT
- stat_done
+
fi
if [ ! -d $MYSQLD_ROOT ]; then
@@ -26,4 +30,5 @@ if [ ! -e /var/log/mysqld.log ]; then
touch /var/log/mysqld.log
chown mysql /var/log/mysqld.log
fi
+
exec /usr/sbin/mysqld --skip-name-resolve -u mysql 2>/dev/null >/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/log/run b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/log/run
index 6ed5184..17692a7 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/log/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/log/run
@@ -1,4 +1,8 @@
#!/bin/sh
exec 2>&1
- /usr/bin/logger -p local7.info -t mythbackend
+#export TERM=linux
+#. /etc/rc.conf
+#. /etc/rc.d/functions
+#stat_runit "Starting MythBackend logger"
+/usr/bin/logger -p local7.info -t mythbackend
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run
index d540e39..51bd046 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run
@@ -2,15 +2,21 @@
exec 2>&1
. /etc/profile
. /etc/systemconfig
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+stat_runit "Starting MythBackend"
export HOME=/root
if [ ! x$SystemType = xSlave_backend ]
then
sv start mysql > /dev/null 2>/dev/null
#run mythfilldatabase
+ printhl " Running mythfilldatabase"
/usr/MythVantage/bin/initial_db_run &
fi
mkfifo /tmp/mbefifo >/dev/null 2>/dev/null
-echo "Starting mythbackend"
+#echo "Starting mythbackend"
# if [ -f /tmp/debug ]
# then
# echo "using gbd/debug"
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/ncid/run b/abs/core-testing/runit-scripts/runitscripts/services/ncid/run
index 7dbc8ba..44154c7 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/ncid/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/ncid/run
@@ -1,12 +1,21 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+
which ncid 2>/dev/null >/dev/null
+
if [ $? = 0 ]
then
if [ -f /var/service/ncidd/run ]
then
sv start ncidd
fi
+
+ stat_runit "Starting callerid client"
+
exec /usr/bin/ncid --no-gui --all --call-prog --program /usr/bin/ncid.py 127.0.0.1 3333
fi
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/ncidd/run b/abs/core-testing/runit-scripts/runitscripts/services/ncidd/run
index f1c710a..6fff089 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/ncidd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/ncidd/run
@@ -1,7 +1,13 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
which ncidd > /dev/null 2>/dev/null
if [ $? = 0 ]
then
+ stat_runit "Starting CallerID"
+
exec /usr/sbin/ncidd -D 2>&1
fi
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/nfsd/run b/abs/core-testing/runit-scripts/runitscripts/services/nfsd/run
index d8435a6..3b63077 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/nfsd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/nfsd/run
@@ -1,5 +1,9 @@
#!/bin/bash
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting NFSD"
# Make sure the statd daemon is up
# (the statd service must ensure portmap is running first)
@@ -11,12 +15,15 @@ source /etc/conf.d/nfs
/usr/sbin/exportfs -ra > /dev/null 2>/dev/null
# start some nfsd threads
+printhl " Using ${NFSD_OPTS} "
/usr/sbin/rpc.nfsd -p ${NFSD_OPTS} >/dev/null 2>/dev/null
# since we are running kernel 2.6 we should also
# mount the nfsd virtual filesystem
+printhl " mount nfsd"
/bin/mount -t nfsd none /proc/fs/nfsd >/dev/null 2>/dev/null
# Start the rpc.mountd daemon
+
exec /usr/sbin/rpc.mountd --foreground >/dev/null 2>/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/nfslock/run b/abs/core-testing/runit-scripts/runitscripts/services/nfslock/run
index 0ec6f75..8d627ad 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/nfslock/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/nfslock/run
@@ -1,4 +1,8 @@
#!/bin/bash
exec 2>&1
-sv start portmap >/dev/null 2>/dev/null
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting NFSlock"
+svwaitup portmap >/dev/null 2>/dev/null
/usr/sbin/rpc.statd -F >/dev/null 2>/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/nmbd/run b/abs/core-testing/runit-scripts/runitscripts/services/nmbd/run
index 9aa27ec..9ed032b 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/nmbd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/nmbd/run
@@ -1,3 +1,9 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting NMBD"
+
+
exec nmbd -F -S -d1 2>/dev/null >/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run b/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run
index 65e551c..146c4e0 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/ntpd/run
@@ -1,3 +1,10 @@
#!/bin/sh
-/usr/bin/ntpdate pool.ntp.org
-exec /usr/bin/ntpd -n -p /var/run/ntpd.pid
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting NTPD"
+printhl " Fetching time"
+msg=`/usr/bin/ntpdate pool.ntp.org `
+printhl " $msg"
+
+exec /usr/bin/ntpd -n -p /var/run/ntpd.pid 2>/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/oss/run b/abs/core-testing/runit-scripts/runitscripts/services/oss/run
index 687de8f..815a34e 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/oss/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/oss/run
@@ -1,5 +1,11 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting OSS"
+
+
rm -f /usr/lib/oss/starting
#exec /etc/rc.d/alsa-utils start all
exec /usr/sbin/soundon
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/portmap/run b/abs/core-testing/runit-scripts/runitscripts/services/portmap/run
index 561d65b..9e708e6 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/portmap/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/portmap/run
@@ -1,3 +1,7 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting portmap"
exec /sbin/portmap -d >/dev/null 2>/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/smbd/run b/abs/core-testing/runit-scripts/runitscripts/services/smbd/run
index af77dcb..b4a545b 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/smbd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/smbd/run
@@ -1,3 +1,9 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Samba"
+
+
exec smbd -F -S -d3 2>/dev/null >/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/sshd/run b/abs/core-testing/runit-scripts/runitscripts/services/sshd/run
index 0dd16ef..fc22e3b 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/sshd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/sshd/run
@@ -1,8 +1,13 @@
#!/bin/bash
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting SSH"
[ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; }
[ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; }
[ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
+
exec /usr/sbin/sshd -D >/dev/null 2>/dev/null
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/syslog-ng/run b/abs/core-testing/runit-scripts/runitscripts/services/syslog-ng/run
index eb56ace..8633a77 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/syslog-ng/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/syslog-ng/run
@@ -1,3 +1,10 @@
#!/bin/sh
exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting syslog"
+
+
exec /usr/sbin/syslog-ng -F
+
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/tty2/run b/abs/core-testing/runit-scripts/runitscripts/services/tty2/run
index 3782aed..8db2924 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/tty2/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/tty2/run
@@ -1,2 +1,7 @@
#!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Agetty 2"
+
exec /sbin/agetty 38400 vc/2 linux
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/tty3/run b/abs/core-testing/runit-scripts/runitscripts/services/tty3/run
index ce66b0d..bdbec66 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/tty3/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/tty3/run
@@ -1,2 +1,6 @@
#!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Agetty 3"
exec /sbin/agetty 38400 vc/3 linux