--- Begin Message ---
Package: runit-services
Version: 0.4.0
Severity: wishlist
Hi!,
I've created a few "/etc/sv" services' directories to run them under runit
supervision. I've tried to make the "run" scripts as similar to the Debian
SysV /etc/init.d/<script> as I could.
I'm attaching a patch against version 0.4.0 of the package.
Please, let me know of this is useful in any way.
Regards.
Analia Lorenzatto
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (900, 'unstable'), (90, 'testing'), (50, 'stable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.26-1-686 (SMP w/2 CPU cores)
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1) (ignored: LC_ALL set to
en_US)
Shell: /bin/sh linked to /bin/dash
diff -Naur orig/apache2/log/run new/apache2/log/run
--- orig/apache2/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/apache2/log/run 2008-11-27 18:25:57.300984876 -0200
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+LOG="/var/log/apache2"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/apache2/run new/apache2/run
--- orig/apache2/run 1969-12-31 21:00:00.000000000 -0300
+++ new/apache2/run 2008-11-27 18:25:57.300984876 -0200
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+exec 2>&1
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/apache2 ] && . /etc/default/apache2
+[ -f /etc/apache2/envvars ] && . /etc/apache2/envvars
+
+# FIXME! Es necesario correr htcacheclean y hacer que dependa de ese daemon
+
+# Si la sintaxis de la config esta mal, no lanza
+/usr/sbin/apache2ctl -t || exit 1
+
+exec chpst -U www-data:www-data /usr/sbin/apache2 -DFOREGROUND
diff -Naur orig/apt-cacher/log/run new/apt-cacher/log/run
--- orig/apt-cacher/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/apt-cacher/log/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+LOG="/var/log/apt-cacher"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/apt-cacher/run new/apt-cacher/run
--- orig/apt-cacher/run 1969-12-31 21:00:00.000000000 -0300
+++ new/apt-cacher/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+exec 1>&2
+
+[ -f /etc/default/apt-cacher ] && . /etc/default/apt-cacher
+
+[ ${AUTOSTART} != 1 ] && exit 0
+
+exec /usr/sbin/apt-cacher -R 3 ${EXTRAOPT}
diff -Naur orig/bacula-director/log/run new/bacula-director/log/run
--- orig/bacula-director/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/bacula-director/log/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+LOG="/var/log/bacula-dir"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
+
diff -Naur orig/bacula-director/run new/bacula-director/run
--- orig/bacula-director/run 1969-12-31 21:00:00.000000000 -0300
+++ new/bacula-director/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+
+exec bacula-dir -c /etc/bacula/bacula-dir.conf -v -u bacula -g bacula -f
+
diff -Naur orig/bacula-fd/log/run new/bacula-fd/log/run
--- orig/bacula-fd/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/bacula-fd/log/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+LOG="/var/log/bacula"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
+
+
diff -Naur orig/bacula-fd/run new/bacula-fd/run
--- orig/bacula-fd/run 1969-12-31 21:00:00.000000000 -0300
+++ new/bacula-fd/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+
+exec bacula-fd -c /etc/bacula/bacula-fd.conf -f
+
diff -Naur orig/bacula-sd/log/run new/bacula-sd/log/run
--- orig/bacula-sd/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/bacula-sd/log/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+LOG="/var/log/bacula-sd"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/bacula-sd/run new/bacula-sd/run
--- orig/bacula-sd/run 1969-12-31 21:00:00.000000000 -0300
+++ new/bacula-sd/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+
+exec bacula-sd -c /etc/bacula/bacula-sd.conf -f -u bacula -g tape
+
diff -Naur orig/bind9/log/run new/bind9/log/run
--- orig/bind9/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/bind9/log/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+LOG="/var/log/bind9"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/bind9/run new/bind9/run
--- orig/bind9/run 1969-12-31 21:00:00.000000000 -0300
+++ new/bind9/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+exec 2>&1
+
+[ -f /etc/default/bind9 ] && . /etc/default/bind9
+
+exec /usr/sbin/named -u bind -f
diff -Naur orig/chrony/log/run new/chrony/log/run
--- orig/chrony/log/run 2008-06-17 16:50:22.000000000 -0300
+++ new/chrony/log/run 2008-11-27 18:25:57.308986231 -0200
@@ -1,8 +1,8 @@
#!/bin/sh
set -e
-LOG=/var/log/chrony
+LOG="/var/log/chrony"
-test -d "$LOG" || mkdir -p -m0750 "$LOG" && chown log:adm "$LOG"
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
-exec chpst -ulog:adm svlogd -tt "$LOG"
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/cron/run new/cron/run
--- orig/cron/run 2008-06-17 16:50:22.000000000 -0300
+++ new/cron/run 2008-11-27 18:25:57.300984876 -0200
@@ -1,10 +1,11 @@
#!/bin/sh
-#
-# please consider switching to the bcron-run package
-
set -e
exec 1>&2
-! update-service --check socklog-unix || sv start socklog-unix
+! test -h /var/service/socklog-unix || sv start socklog-unix
+
+# FIXME!: El cron en los domUs "PARECE" no soportar que le limiten la
+# memoria a 3 MB.
+#exec chpst -m3000000 cron -f
-exec cron -f
+exec chpst cron -f
diff -Naur orig/cupsys/log/run new/cupsys/log/run
--- orig/cupsys/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/cupsys/log/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+
+LOG="/var/log/cupsys"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
+
diff -Naur orig/cupsys/run new/cupsys/run
--- orig/cupsys/run 1969-12-31 21:00:00.000000000 -0300
+++ new/cupsys/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+exec 2>&1
+
+exec cupsd -f
+
diff -Naur orig/dbus/run new/dbus/run
--- orig/dbus/run 1969-12-31 21:00:00.000000000 -0300
+++ new/dbus/run 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+exec 2>&1
+
+USER=messagebus
+
+# Source defaults file; edit that file to configure this script.
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+ . /etc/default/dbus
+fi
+
+# Comento el fork en la config, por si esas cosas me olvide de hacerlo a mano
+grep -q "<\!-- <fork\/> -->" /etc/dbus-1/system.conf
+if [ ${?} -ne 0 ]
+then
+ logger "DBUS: comentando el fork"
+ TMPFILE=`mktemp`
+ sed s/"<fork\/>"/"<\!-- <fork\/> -->"/g /etc/dbus-1/system.conf > ${TMPFILE} || exit 1
+ mv ${TMPFILE} /etc/dbus-1/system.conf || exit 1
+fi
+
+# Genero el uuid para la PC
+/usr/bin/dbus-uuidgen --ensure
+
+# IMPORTANTE!!!! Es necesario comentar la linea de <fork/> en la config
+
+exec chpst -u ${USER} /usr/bin/dbus-daemon
+
diff -Naur orig/dhclient/log/run new/dhclient/log/run
--- orig/dhclient/log/run 2008-06-17 16:50:22.000000000 -0300
+++ new/dhclient/log/run 2008-11-27 18:25:57.308986231 -0200
@@ -1,8 +1,8 @@
#!/bin/sh
set -e
-LOG=/var/log/dhclient
+LOG="/var/log/dhclient"
-test -d "$LOG" || mkdir -p -m0750 "$LOG" && chown log:adm "$LOG"
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
-exec chpst -ulog:adm svlogd -tt "$LOG"
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/dhcp/log/run new/dhcp/log/run
--- orig/dhcp/log/run 2008-06-17 16:50:22.000000000 -0300
+++ new/dhcp/log/run 2008-11-27 18:25:57.312986595 -0200
@@ -1,8 +1,8 @@
#!/bin/sh
set -e
-LOG=/var/log/dhcp
+LOG="/var/log/dhcp"
-test -d "$LOG" || mkdir -p -m0750 "$LOG" && chown log:adm "$LOG"
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
-exec chpst -ulog:adm svlogd -tt "$LOG"
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/dhcpd3/log/run new/dhcpd3/log/run
--- orig/dhcpd3/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/dhcpd3/log/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+LOG="/var/log/dhcpd3"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
+
diff -Naur orig/dhcpd3/run new/dhcpd3/run
--- orig/dhcpd3/run 1969-12-31 21:00:00.000000000 -0300
+++ new/dhcpd3/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+
+exec /usr/sbin/dhcpd3 -q intranet -f
+
diff -Naur orig/dictd/run new/dictd/run
--- orig/dictd/run 1969-12-31 21:00:00.000000000 -0300
+++ new/dictd/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+exec 1>&2
+
+[ -f /etc/default/dictd ] && . /etc/default/dictd
+
+exec /usr/sbin/dictd --debug nodetach --log none ${DICTD_ARGS}
diff -Naur orig/gdm/log/run new/gdm/log/run
--- orig/gdm/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/gdm/log/run 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+LOG="/var/log/gdm"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/getty-1/finish new/getty-1/finish
--- orig/getty-1/finish 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-1/finish 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec utmpset -w tty1
diff -Naur orig/getty-1/run new/getty-1/run
--- orig/getty-1/run 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-1/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+! type fgetty >/dev/null 2>&1 || exec chpst -P fgetty tty1
+exec getty 38400 tty1 linux
diff -Naur orig/getty-2/finish new/getty-2/finish
--- orig/getty-2/finish 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-2/finish 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec utmpset -w tty2
diff -Naur orig/getty-2/run new/getty-2/run
--- orig/getty-2/run 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-2/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+! type fgetty >/dev/null 2>&1 || exec chpst -P fgetty tty2
+exec getty 38400 tty2 linux
diff -Naur orig/getty-3/finish new/getty-3/finish
--- orig/getty-3/finish 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-3/finish 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec utmpset -w tty3
diff -Naur orig/getty-3/run new/getty-3/run
--- orig/getty-3/run 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-3/run 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+! type fgetty >/dev/null 2>&1 || exec chpst -P fgetty tty3
+exec getty 38400 tty3 linux
diff -Naur orig/getty-4/finish new/getty-4/finish
--- orig/getty-4/finish 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-4/finish 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec utmpset -w tty4
diff -Naur orig/getty-4/run new/getty-4/run
--- orig/getty-4/run 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-4/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+! type fgetty >/dev/null 2>&1 || exec chpst -P fgetty tty4
+exec getty 38400 tty4 linux
diff -Naur orig/getty-5/finish new/getty-5/finish
--- orig/getty-5/finish 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-5/finish 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec utmpset -w tty5
diff -Naur orig/getty-5/run new/getty-5/run
--- orig/getty-5/run 1969-12-31 21:00:00.000000000 -0300
+++ new/getty-5/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+! type fgetty >/dev/null 2>&1 || exec chpst -P fgetty tty5
+exec getty 38400 tty5 linux
diff -Naur orig/hal/log/run new/hal/log/run
--- orig/hal/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/hal/log/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+
+LOG="/var/log/cupsys"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
+
diff -Naur orig/hal/run new/hal/run
--- orig/hal/run 1969-12-31 21:00:00.000000000 -0300
+++ new/hal/run 2008-11-27 18:25:57.308986231 -0200
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+exec 2>&1
+
+exec cupsd -f
+
diff -Naur orig/nfs-kernel-server/finish new/nfs-kernel-server/finish
--- orig/nfs-kernel-server/finish 2008-06-17 16:50:22.000000000 -0300
+++ new/nfs-kernel-server/finish 2008-11-27 18:25:57.300984876 -0200
@@ -1,5 +1,5 @@
#!/bin/sh
exec 2>&1
exportfs -a -u -v
-! update-service --check portmap || ! sv start portmap >/dev/null ||
+! test -h /var/service/portmap || ! sv start portmap >/dev/null ||
exec rpc.nfsd -- 0
diff -Naur orig/nfs-kernel-server/log/run new/nfs-kernel-server/log/run
--- orig/nfs-kernel-server/log/run 2008-06-17 16:50:22.000000000 -0300
+++ new/nfs-kernel-server/log/run 2008-11-27 18:25:57.300984876 -0200
@@ -1,8 +1,8 @@
#!/bin/sh
set -e
-LOG=/var/log/nfs-kernel-server
+LOG="/var/log/nfs-kernel-server"
-test -d "$LOG" || mkdir -p -m0750 "$LOG" && chown log:adm "$LOG"
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
-exec chpst -ulog:adm svlogd -tt "$LOG"
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/nslcd/run new/nslcd/run
--- orig/nslcd/run 1969-12-31 21:00:00.000000000 -0300
+++ new/nslcd/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+exec 2>&1
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/nslcd ] && . /etc/default/nslcd
+
+exec nslcd -d > /dev/null 2>&1
diff -Naur orig/nut/log/run new/nut/log/run
--- orig/nut/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/nut/log/run 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+LOG="/var/log/bind9"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/nut/run new/nut/run
--- orig/nut/run 1969-12-31 21:00:00.000000000 -0300
+++ new/nut/run 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+exec 2>&1
+
+[ -f /etc/default/bind9 ] && . /etc/default/bind9
+
+exec /usr/sbin/named -u bind -f
diff -Naur orig/portmap/log/run new/portmap/log/run
--- orig/portmap/log/run 2008-06-17 16:50:22.000000000 -0300
+++ new/portmap/log/run 2008-11-27 18:25:57.304987195 -0200
@@ -1,8 +1,8 @@
#!/bin/sh
set -e
-LOG=/var/log/portmap
+LOG="/var/log/portmap"
-test -d "$LOG" || mkdir -p -m0750 "$LOG" && chown log:adm "$LOG"
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
-exec chpst -ulog:adm svlogd -tt "$LOG"
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/postgresql-8.3/log/run new/postgresql-8.3/log/run
--- orig/postgresql-8.3/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/postgresql-8.3/log/run 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+# FIXME: Poner el nombre del servicio adecuado
+# Tambien verificar si los logs estaran centralizados
+SERVICIO=postgresql
+
+LOG=/var/log/${SERVICIO}
+
+test -d "$LOG" || mkdir -p -m0750 "$LOG" && chown log:adm "$LOG"
+
+exec chpst -ulog:adm svlogd -tt "$LOG"
+
diff -Naur orig/postgresql-8.3/run new/postgresql-8.3/run
--- orig/postgresql-8.3/run 1969-12-31 21:00:00.000000000 -0300
+++ new/postgresql-8.3/run 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+exec 2>&1
+# FIXME: poner el nombre adecuado del servicio a lanzar.
+# verificar que los parametros que se pasan son adecuados, de acuerdo al init.d
+# original.
+
+exec chpst -u postgres:postgres:ssl-cert \
+/usr/lib/postgresql/8.3/bin/postmaster \
+-D /var/lib/postgresql/8.3/main/base -c \
+config_file=/etc/postgresql/8.3/main/postgresql.conf
+
diff -Naur orig/pound/log/run new/pound/log/run
--- orig/pound/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/pound/log/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+
+LOG="/var/log/pound"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
+
diff -Naur orig/pound/run new/pound/run
--- orig/pound/run 1969-12-31 21:00:00.000000000 -0300
+++ new/pound/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,33 @@
+#! /bin/sh
+
+NAME=pound
+DAEMON=/usr/sbin/pound
+DAEMON_ARGS=""
+
+# Read configuration variable file if it is present
+# Check if pound is configured or not
+if [ -f "/etc/default/pound" ]
+then
+ . /etc/default/pound
+ if [ "$startup" != "1" ]
+ then
+ logger -p warning "$NAME will not start unconfigured."
+ logger -p warning "Please configure; afterwards, set startup=1 in
+/etc/default/pound."
+ exit 1
+ fi
+ # See if it's configured to run in the foreground
+ FG=`grep "Daemon" /etc/pound/pound.cfg | awk '{ print $2;}'`
+ if [ "x"${FG} != "x0" ]
+ then
+ logger -p warning "Please configure Daemon 0 in /etc/pound/pound.cfg to
+run it in the foreground"
+ exit 1
+ fi
+else
+ logger -p warning "/etc/default/pound not found"
+ exit 1
+fi
+
+exec ${DAEMON}
+
diff -Naur orig/puppetd/run new/puppetd/run
--- orig/puppetd/run 1969-12-31 21:00:00.000000000 -0300
+++ new/puppetd/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+exec 2>&1
+
+SERVICIO=puppetd
+SERVICIO_BIN="/usr/sbin/puppetd"
+
+[ -r /etc/default/puppet ] && . /etc/default/puppet
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/${SERVICIO} ] && . /etc/default/${SERVICIO}
+
+exec ${SERVICIO_BIN} ${DAEMON_OPTS}
diff -Naur orig/rpc.statd/log/run new/rpc.statd/log/run
--- orig/rpc.statd/log/run 2008-06-17 16:50:22.000000000 -0300
+++ new/rpc.statd/log/run 1969-12-31 21:00:00.000000000 -0300
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-LOG=/var/log/rpc.statd
-
-test -d "$LOG" || mkdir -p -m0750 "$LOG" && chown log:adm "$LOG"
-
-exec chpst -ulog:adm svlogd -tt "$LOG"
diff -Naur orig/rpc.statd/run new/rpc.statd/run
--- orig/rpc.statd/run 2008-06-17 16:50:22.000000000 -0300
+++ new/rpc.statd/run 1969-12-31 21:00:00.000000000 -0300
@@ -1,3 +0,0 @@
-#!/bin/bash
-exec 2>&1
-exec rpc.statd -F -d
diff -Naur orig/saslauthd/log/run new/saslauthd/log/run
--- orig/saslauthd/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/saslauthd/log/run 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+# FIXME: Poner el nombre del servicio adecuado
+# Tambien verificar si los logs estaran centralizados
+
+LOG=/var/log/saslauthd
+
+test -d "$LOG" || mkdir -p -m0750 "$LOG" && chown log:adm "$LOG"
+
+exec chpst -ulog:adm svlogd -tt "$LOG"
diff -Naur orig/saslauthd/run new/saslauthd/run
--- orig/saslauthd/run 1969-12-31 21:00:00.000000000 -0300
+++ new/saslauthd/run 2008-11-27 18:25:57.304987195 -0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+exec 2>&1
+# FIXME: poner el nombre adecuado del servicio a lanzar.
+# verificar que los parametros que se pasan son adecuados, de acuerdo al init.d
+# original.
+
+exec saslauthd -d -a pam -c -m /var/run/saslauthd -n 5
+
diff -Naur orig/slapd/log/run new/slapd/log/run
--- orig/slapd/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/slapd/log/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+
+LOG="/var/log/slapd"
+
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
+
+exec chpst -ulog:adm svlogd -tt ${LOG}
+
diff -Naur orig/slapd/run new/slapd/run
--- orig/slapd/run 1969-12-31 21:00:00.000000000 -0300
+++ new/slapd/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+exec 2>&1
+
+[ -f /etc/default/slapd ] && . /etc/default/slapd
+# Load the default location of the slapd config file
+if [ -z "$SLAPD_CONF" ]; then
+ SLAPD_CONF="/etc/ldap/slapd.conf"
+else
+ SLAPD_OPTIONS="-f $SLAPD_CONF $SLAPD_OPTIONS"
+ SLURPD_OPTIONS="-f $SLAPD_CONF $SLURPD_OPTIONS"
+fi
+
+# Pass the user and group to run under to slapd
+if [ "$SLAPD_USER" ]; then
+ SLAPD_OPTIONS="-u $SLAPD_USER $SLAPD_OPTIONS"
+fi
+if [ "$SLAPD_GROUP" ]; then
+ SLAPD_OPTIONS="-g $SLAPD_GROUP $SLAPD_OPTIONS"
+fi
+
+if [ -n "$SLAPD_SERVICES" ]; then
+ SLAPD_OPTIONS=" -h $SLAPD_SERVICES $SLAPD_OPTIONS"
+fi
+
+exec /usr/sbin/slapd -d 0 $SLAPD_OPTIONS
+
diff -Naur orig/socklog-inet/log/run new/socklog-inet/log/run
--- orig/socklog-inet/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-inet/log/run 2008-11-27 18:25:57.300984876 -0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -ulog svlogd -t main/main
diff -Naur orig/socklog-inet/run new/socklog-inet/run
--- orig/socklog-inet/run 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-inet/run 2008-11-27 18:25:57.300984876 -0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -Unobody socklog inet 0 514
diff -Naur orig/socklog-klog/log/run new/socklog-klog/log/run
--- orig/socklog-klog/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-klog/log/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -ulog svlogd -tt main/main
diff -Naur orig/socklog-klog/run new/socklog-klog/run
--- orig/socklog-klog/run 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-klog/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,6 @@
+#!/bin/sh
+USER=nobody
+exec </proc/kmsg
+exec 2>&1
+test "`uname -r |cut -c0-4`" != '2.6.' || USER=root
+exec chpst -u"$USER" socklog ucspi
diff -Naur orig/socklog-notify/run new/socklog-notify/run
--- orig/socklog-notify/run 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-notify/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+MAILTO=root
+PIPE=/var/log/socklog/.notify
+
+if [ ! -p "$PIPE" ]; then mkfifo -m0620 "$PIPE"; chown log:adm "$PIPE"; fi
+exec <> "$PIPE"
+exec chpst -ulog uncat -s49999 -t180 \
+ env MAILUSER=log MAILNAME='socklog notify' \
+ mail -s socklog-notify $MAILTO
diff -Naur orig/socklog-ucspi-tcp/log/run new/socklog-ucspi-tcp/log/run
--- orig/socklog-ucspi-tcp/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-ucspi-tcp/log/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -ulog svlogd -t main/main
diff -Naur orig/socklog-ucspi-tcp/run new/socklog-ucspi-tcp/run
--- orig/socklog-ucspi-tcp/run 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-ucspi-tcp/run 2008-11-27 18:25:57.312986595 -0200
@@ -0,0 +1,4 @@
+#!/bin/sh
+PORT=10116
+exec 2>&1
+exec tcpsvd -vllogserver -unobody 0 "$PORT" socklog ucspi TCPREMOTEIP
diff -Naur orig/socklog-unix/check new/socklog-unix/check
--- orig/socklog-unix/check 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-unix/check 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>/dev/null
+exec socklog-check unix /dev/log
diff -Naur orig/socklog-unix/log/run new/socklog-unix/log/run
--- orig/socklog-unix/log/run 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-unix/log/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec chpst -ulog svlogd \
+ main/main main/auth main/cron main/daemon main/debug main/ftp \
+ main/kern main/local main/mail main/news main/syslog main/user
diff -Naur orig/socklog-unix/run new/socklog-unix/run
--- orig/socklog-unix/run 1969-12-31 21:00:00.000000000 -0300
+++ new/socklog-unix/run 2008-11-27 18:25:57.316986330 -0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -Unobody socklog unix /dev/log
diff -Naur orig/ssh/log/run new/ssh/log/run
--- orig/ssh/log/run 2008-06-17 16:50:23.000000000 -0300
+++ new/ssh/log/run 2008-11-27 18:25:57.312986595 -0200
@@ -1,8 +1,8 @@
#!/bin/sh
set -e
-LOG=/var/log/ssh
+LOG="/var/log/ssh"
-test -d "$LOG" || mkdir -p -m0750 "$LOG" && chown log:adm "$LOG"
+test -d ${LOG} || mkdir -p -m0750 ${LOG} && chown log:adm ${LOG}
-exec chpst -ulog:adm svlogd -tt "$LOG"
+exec chpst -ulog:adm svlogd -tt ${LOG}
diff -Naur orig/ssh/run new/ssh/run
--- orig/ssh/run 2008-06-17 16:50:23.000000000 -0300
+++ new/ssh/run 2008-11-27 18:25:57.312986595 -0200
@@ -5,9 +5,9 @@
SSHD=$(which sshd) || sv down $(pwd)
PRIVSEP_DIR=/var/run/sshd
-mkdir -p "$PRIVSEP_DIR"
+mkdir -p ${PRIVSEP_DIR}
-exec "$SSHD" -D -e
+exec ${SSHD} -D -e
# memory limits set by chpst are inherited to subprocesses,
# disabled by default
--- End Message ---
