[Initng-svn] r1981 - initng/initfiles/daemon
svn at initng.thinktux.net
svn at initng.thinktux.net
Mon Nov 7 23:28:28 CET 2005
Author: jimmy
Date: Mon Nov 7 23:28:27 2005
New Revision: 1981
Modified:
initng/initfiles/daemon/NetworkManager.ii
initng/initfiles/daemon/NetworkManagerDispatcher.ii
initng/initfiles/daemon/acpid.ii
initng/initfiles/daemon/adsl.ii
initng/initfiles/daemon/agetty.ii
initng/initfiles/daemon/anacron.ii
initng/initfiles/daemon/apache.ii
initng/initfiles/daemon/apache2.ii
initng/initfiles/daemon/atd.ii
initng/initfiles/daemon/athcool.ii
initng/initfiles/daemon/avahi-daemon.ii
initng/initfiles/daemon/avahi-dnsconfd.ii
initng/initfiles/daemon/cardmgr.ii
initng/initfiles/daemon/comar.ii
initng/initfiles/daemon/cpufreqd.ii
initng/initfiles/daemon/cupsd.ii
initng/initfiles/daemon/dbus.ii
initng/initfiles/daemon/dcron.ii
Log:
Translated 20 daemons to use @daemon@
Modified: initng/initfiles/daemon/NetworkManager.ii
==============================================================================
--- initng/initfiles/daemon/NetworkManager.ii (original)
+++ initng/initfiles/daemon/NetworkManager.ii Mon Nov 7 23:28:27 2005
@@ -11,7 +11,7 @@
chown -R bind:bind /var/lib/NetworkManager
chmod 755 /var/lib/NetworkManager
- exec /usr/sbin/NetworkManager
+ exec @/usr/sbin/NetworkManager@
exit 1
}
}
Modified: initng/initfiles/daemon/NetworkManagerDispatcher.ii
==============================================================================
--- initng/initfiles/daemon/NetworkManagerDispatcher.ii (original)
+++ initng/initfiles/daemon/NetworkManagerDispatcher.ii Mon Nov 7 23:28:27 2005
@@ -3,5 +3,5 @@
need = system/initial system/mountfs daemon/dbus daemon/NetworkManager
use = daemon/acpid
pid_file = /var/run/NetworkManagerDispatcher
- daemon = /usr/sbin/NetworkManagerDispatcher
+ daemon = @/usr/sbin/NetworkManagerDispatcher@
}
Modified: initng/initfiles/daemon/acpid.ii
==============================================================================
--- initng/initfiles/daemon/acpid.ii (original)
+++ initng/initfiles/daemon/acpid.ii Mon Nov 7 23:28:27 2005
@@ -34,7 +34,7 @@
# Check for daemon presence
- test -x /usr/sbin/acpid || exit 0
+ test -x @/usr/sbin/acpid@ || exit 0
# Check for ACPI support on kernel side
[ -d /proc/acpi ] || exit 0
@@ -52,6 +52,6 @@
# modprobe ${x} &> /dev/null
#done
- exec /usr/sbin/acpid -f -c /etc/acpi/events
+ exec @/usr/sbin/acpid@ -f -c /etc/acpi/events
}
}
Modified: initng/initfiles/daemon/adsl.ii
==============================================================================
--- initng/initfiles/daemon/adsl.ii (original)
+++ initng/initfiles/daemon/adsl.ii Mon Nov 7 23:28:27 2005
@@ -1,10 +1,6 @@
service daemon/adsl {
need = system/localmount system/modules system/hostname net/eth0
use = system/static-modules system/coldplug
- start {
- adsl-start
- }
- stop {
- adsl-stop
- }
+ start = @adsl-start@
+ stop = @adsl-stop@
}
Modified: initng/initfiles/daemon/agetty.ii
==============================================================================
--- initng/initfiles/daemon/agetty.ii (original)
+++ initng/initfiles/daemon/agetty.ii Mon Nov 7 23:28:27 2005
@@ -1,7 +1,7 @@
daemon daemon/agetty/tty1 {
need = system/mountfs
- daemon = /sbin/agetty
+ daemon = @/sbin/agetty@
daemon_args = 38400 $NAME
respawn
last
@@ -9,7 +9,7 @@
daemon daemon/agetty/* {
need = system/mountfs
- daemon = /sbin/agetty
+ daemon = @/sbin/agetty@
daemon_args = 38400 $NAME
respawn
}
Modified: initng/initfiles/daemon/anacron.ii
==============================================================================
--- initng/initfiles/daemon/anacron.ii (original)
+++ initng/initfiles/daemon/anacron.ii Mon Nov 7 23:28:27 2005
@@ -2,7 +2,7 @@
need = system/initial system/clock system/mountfs
#provide = cron
#virtual_use = logger
- daemon = /usr/sbin/anacron
+ daemon = @/usr/sbin/anacron@
daemon_args = -s -d
#pid_file = /var/run/cron.pid
}
Modified: initng/initfiles/daemon/apache.ii
==============================================================================
--- initng/initfiles/daemon/apache.ii (original)
+++ initng/initfiles/daemon/apache.ii Mon Nov 7 23:28:27 2005
@@ -4,7 +4,7 @@
use = daemon/sshd daemon/mysql daemon/postgres system/netmount
require_network
#virtual_use = net dns logger
- daemon = /usr/sbin/apache
+ daemon = @/usr/sbin/apache@
#daemon_args = -DPHP
pid_file = /var/run/apache.pid
}
Modified: initng/initfiles/daemon/apache2.ii
==============================================================================
--- initng/initfiles/daemon/apache2.ii (original)
+++ initng/initfiles/daemon/apache2.ii Mon Nov 7 23:28:27 2005
@@ -4,7 +4,7 @@
require_network
use = daemon/sshd daemon/mysql daemon/postgres system/netmount
#virtual_use = net dns logger
- daemon = /usr/sbin/apache2
+ daemon = @/usr/sbin/apache2@
daemon_args = "-D PHP5 -k start"
pid_file = /var/run/apache2.pid
}
Modified: initng/initfiles/daemon/atd.ii
==============================================================================
--- initng/initfiles/daemon/atd.ii (original)
+++ initng/initfiles/daemon/atd.ii Mon Nov 7 23:28:27 2005
@@ -1,5 +1,5 @@
daemon daemon/atd {
need = system/initial system/clock system/mountfs
- daemon = /usr/sbin/atd
+ daemon = @/usr/sbin/atd@
pid_file = /var/run/atd.pid
}
\ No newline at end of file
Modified: initng/initfiles/daemon/athcool.ii
==============================================================================
--- initng/initfiles/daemon/athcool.ii (original)
+++ initng/initfiles/daemon/athcool.ii Mon Nov 7 23:28:27 2005
@@ -1,11 +1,7 @@
service daemon/athcool {
need = system/initial system/mountfs system/bootmisc
- start {
- /usr/sbin/athcool on &>/dev/null
- exit 0
- }
- stop {
- /usr/sbin/athcool off &>/dev/null
- exit 0
- }
+ start = @/usr/sbin/athcool@
+ start_args = on
+ stop = @/usr/sbin/athcool@
+ stop_args = off
}
Modified: initng/initfiles/daemon/avahi-daemon.ii
==============================================================================
--- initng/initfiles/daemon/avahi-daemon.ii (original)
+++ initng/initfiles/daemon/avahi-daemon.ii Mon Nov 7 23:28:27 2005
@@ -1,7 +1,7 @@
daemon daemon/avahi-daemon {
need = system/mountfs system/modules daemon/dbus
require_network
- daemon = /usr/sbin/avahi-daemon
+ daemon = @/usr/sbin/avahi-daemon@
daemon_args = -s
pid_file = /var/run/avahi-daemon/pid
}
Modified: initng/initfiles/daemon/avahi-dnsconfd.ii
==============================================================================
--- initng/initfiles/daemon/avahi-dnsconfd.ii (original)
+++ initng/initfiles/daemon/avahi-dnsconfd.ii Mon Nov 7 23:28:27 2005
@@ -1,5 +1,5 @@
daemon daemon/avahi-dnsconfd {
need = system/mountfs system/modules daemon/dbus daemon/avahi-daemon
require_network
- daemon = /usr/sbin/avahi-dnsconfd
+ daemon = @/usr/sbin/avahi-dnsconfd@
}
Modified: initng/initfiles/daemon/cardmgr.ii
==============================================================================
--- initng/initfiles/daemon/cardmgr.ii (original)
+++ initng/initfiles/daemon/cardmgr.ii Mon Nov 7 23:28:27 2005
@@ -3,7 +3,7 @@
# don't know hot to get this into foreground!
daemon daemon/cardmgr {
need = system/initial system/mountroot system/modules system/pcmcia
- daemon = /sbin/cardmgr
+ daemon = @/sbin/cardmgr@
daemon_args = -s /var/run/stab
pid_file = /var/run/cardmgr.pid
}
Modified: initng/initfiles/daemon/comar.ii
==============================================================================
--- initng/initfiles/daemon/comar.ii (original)
+++ initng/initfiles/daemon/comar.ii Mon Nov 7 23:28:27 2005
@@ -1,14 +1,5 @@
daemon daemon/comar {
need = system/initial system/mountfs
- daemon {
-
- # Clear pid file.
- rm /var/run/comar.pid &> /dev/null
-
- exec /usr/bin/comar &> /dev/null
-
- echo "COMAR failed to start!"
- exit 1
- }
+ daemon = @/usr/bin/comar@
}
Modified: initng/initfiles/daemon/cpufreqd.ii
==============================================================================
--- initng/initfiles/daemon/cpufreqd.ii (original)
+++ initng/initfiles/daemon/cpufreqd.ii Mon Nov 7 23:28:27 2005
@@ -1,6 +1,6 @@
daemon daemon/cpufreqd {
need = system/initial system/mountfs
- daemon = /usr/sbin/cpufreqd
+ daemon = @/usr/sbin/cpufreqd@
daemon_args = --no-daemon
}
Modified: initng/initfiles/daemon/cupsd.ii
==============================================================================
--- initng/initfiles/daemon/cupsd.ii (original)
+++ initng/initfiles/daemon/cupsd.ii Mon Nov 7 23:28:27 2005
@@ -9,6 +9,6 @@
daemon daemon/cupsd {
need = system/initial system/mountroot net/lo
use = daemon/printconf daemon/hpiod daemon/hpssd
- daemon = /usr/sbin/cupsd
+ daemon = @/usr/sbin/cupsd@
daemon_args = -f
}
Modified: initng/initfiles/daemon/dbus.ii
==============================================================================
--- initng/initfiles/daemon/dbus.ii (original)
+++ initng/initfiles/daemon/dbus.ii Mon Nov 7 23:28:27 2005
@@ -13,8 +13,8 @@
#endd
daemon {
- killall dbus-daemon &> /dev/null
- killall dbus-daemon-1 &> /dev/null
+ killall @dbus-daemon@ &> /dev/null
+ killall @dbus-daemon-1@ &> /dev/null
#ifd fedora
rm -f /var/run/messagebus.pid &> /dev/null
@@ -28,10 +28,10 @@
#exec
- if [ -x /usr/bin/dbus-daemon ]; then
- echo " exec /usr/bin/dbus-daemon --system --fork"
- elif [ -x /usr/bin/dbus-daemon-1 ]; then
- echo " exec /usr/bin/dbus-daemon-1 --system --fork"
+ if [ -x @/usr/bin/dbus-daemon@ ]; then
+ echo " exec @/usr/bin/dbus-daemon@ --system --fork"
+ elif [ -x @/usr/bin/dbus-daemon-1@ ]; then
+ echo " exec @/usr/bin/dbus-daemon-1@ --system --fork"
fi
#endexec
exit 1
Modified: initng/initfiles/daemon/dcron.ii
==============================================================================
--- initng/initfiles/daemon/dcron.ii (original)
+++ initng/initfiles/daemon/dcron.ii Mon Nov 7 23:28:27 2005
@@ -1,5 +1,5 @@
daemon daemon/dcron {
need = system/initial system/clock system/mountfs
- daemon = /usr/sbin/crond
+ daemon = @/usr/sbin/crond@
daemon_args = -n
}
More information about the Initng-svn
mailing list