[Initng-svn] r1982 - initng/initfiles/daemon
svn at initng.thinktux.net
svn at initng.thinktux.net
Mon Nov 7 23:35:01 CET 2005
Author: jimmy
Date: Mon Nov 7 23:34:57 2005
New Revision: 1982
Modified:
initng/initfiles/daemon/dhclient-old.ii
initng/initfiles/daemon/dhclient.ii
initng/initfiles/daemon/dhcpcd.ii
initng/initfiles/daemon/distccd.ii
initng/initfiles/daemon/dnsmasq.ii
initng/initfiles/daemon/entranced.ii
initng/initfiles/daemon/esound.ii
initng/initfiles/daemon/fakeidentd.ii
initng/initfiles/daemon/famd.ii
initng/initfiles/daemon/fcron.ii
initng/initfiles/daemon/fetchmail.ii
initng/initfiles/daemon/gdm.ii
initng/initfiles/daemon/getty.ii
initng/initfiles/daemon/gpm.ii
initng/initfiles/daemon/hald.ii
initng/initfiles/daemon/hddtemp.ii
initng/initfiles/daemon/hpiod.ii
initng/initfiles/daemon/hpssd.ii
initng/initfiles/daemon/ifplugd.ii
initng/initfiles/daemon/instant-gdm.ii
initng/initfiles/daemon/ivman.ii
Log:
20 more service @converted@
Modified: initng/initfiles/daemon/dhclient-old.ii
==============================================================================
--- initng/initfiles/daemon/dhclient-old.ii (original)
+++ initng/initfiles/daemon/dhclient-old.ii Mon Nov 7 23:34:57 2005
@@ -2,46 +2,8 @@
#*/
need = system/initial system/mountroot system/modules system/hostname
use = system/static-modules system/coldplug
- daemon = /sbin/dhclient
+ daemon = @/sbin/dhclient@
daemon_args = $NAME
pid_file = /var/run/dhclient-$NAME.pid
- #respawn
-
- #start {
- # if [[ -e /etc/conf.d/net ]]; then
- # source /etc/conf.d/net
- # fi
- # eval opts=\"\$\{dhclient_${NAME}\}\"
- #
- # pidfile="/var/run/dhclient-${NAME}.pid"
- #
- # x=$( eval /sbin/dhclient ${opts} -1 -sf /lib/initng/scripts/net/dhclient-wrapper -pf ${pidfile} -q ${NAME} )
- # [[ ${x:((${#x} - 5)):5} == "bound" ]] && exit 0
- #
- # # We need to kill the rogue dhclient process if we failed to get an address
- # if [[ -f ${pidifle} ]]; then
- # kill -s TERM $( < ${pidfile} ) 2>/dev/null
- # rm -f ${pidifle}
- # fi
- # exit 1
- #}
- #
- #stop {
- # if [[ -e /etc/conf.d/net ]]; then
- # source /etc/conf.d/net
- # fi
- #
- # pidfile="/var/run/dhclient-${NAME}.pid"
- #
- # eval d=\" \$\{dhcp_${NAME}\} \"
- # [[ -z ${d} ]] && d="${dhcp}"
- # if [[ ${d} != *' norelease '* ]]; then
- # /sbin/dhclient -q -r -sf /lib/initng/scripts/net/dhclient-wrapper -pf ${pidfile} ${NAME}
- # leasefile="/var/cache/dhcp-${NAME}.lease"
- # [[ -f ${leasefile} ]] && rm -f ${leasefile}
- # else
- # kill -s TERM $( < ${pidfile} ) 2>dev/null
- # rm -f ${pidfile}
- # fi
- # }
+
}
Modified: initng/initfiles/daemon/dhclient.ii
==============================================================================
--- initng/initfiles/daemon/dhclient.ii (original)
+++ initng/initfiles/daemon/dhclient.ii Mon Nov 7 23:34:57 2005
@@ -3,7 +3,7 @@
need = system/initial system/mountfs system/modules system/hostname
use = system/static-modules system/coldplug
stdout = /var/log/dhclient.$NAME
- daemon = /sbin/dhclient
+ daemon = @/sbin/dhclient@
daemon_args = -d $NAME
#pid_file = /var/run/dhclient-$NAME.pid
#respawn
Modified: initng/initfiles/daemon/dhcpcd.ii
==============================================================================
--- initng/initfiles/daemon/dhcpcd.ii (original)
+++ initng/initfiles/daemon/dhcpcd.ii Mon Nov 7 23:34:57 2005
@@ -30,7 +30,7 @@
&& ${opts} != *' -h '* && ${d} != *' nohostname '* ]] \
&& opts="${opts} -h ${h}"
- exec /sbin/dhcpcd ${opts} ${NAME}
+ exec @/sbin/dhcpcd@ ${opts} ${NAME}
}
}
Modified: initng/initfiles/daemon/distccd.ii
==============================================================================
--- initng/initfiles/daemon/distccd.ii (original)
+++ initng/initfiles/daemon/distccd.ii Mon Nov 7 23:34:57 2005
@@ -2,7 +2,7 @@
daemon daemon/distccd {
need = system/initial system/mountfs net/lo
require_network
- daemon = /usr/bin/distccd
+ daemon = @/usr/bin/distccd@
#todo, this needs configuration + pidfile instead of --no-detach
daemon_args = --no-detach -N 10 --user distcc --pid-file /var/run/distccd/distccd.pid --port 3632 --allow 192.168.2.0/24
Modified: initng/initfiles/daemon/dnsmasq.ii
==============================================================================
--- initng/initfiles/daemon/dnsmasq.ii (original)
+++ initng/initfiles/daemon/dnsmasq.ii Mon Nov 7 23:34:57 2005
@@ -1,7 +1,7 @@
daemon daemon/dnsmasq {
need = system/initial system/mountroot system/modules system/hostname
use = system/static-modules system/coldplug
- daemon = /usr/sbin/dnsmasq
+ daemon = @/usr/sbin/dnsmasq@
daemon_args = -d
# pid_file = /var/run/dnsmasq.pid
}
Modified: initng/initfiles/daemon/entranced.ii
==============================================================================
--- initng/initfiles/daemon/entranced.ii (original)
+++ initng/initfiles/daemon/entranced.ii Mon Nov 7 23:34:57 2005
@@ -1,7 +1,7 @@
daemon daemon/entranced {
need = system/initial system/mountfs system/hostname net/lo system/modules
use = system/static-modules system/coldplug system/netmount
- daemon = /usr/sbin/entranced
+ daemon = @/usr/sbin/entranced@
daemon_args = -nodaemon
pid_file = /var/run/entranced.pid
}
Modified: initng/initfiles/daemon/esound.ii
==============================================================================
--- initng/initfiles/daemon/esound.ii (original)
+++ initng/initfiles/daemon/esound.ii Mon Nov 7 23:34:57 2005
@@ -2,6 +2,6 @@
daemon daemon/esound {
need = system/initial system/mountroot system/alsasound
- daemon = /usr/bin/esd
+ daemon = @/usr/bin/esd@
daemon_args = -nobeeps -as 2 -tcp -public
}
Modified: initng/initfiles/daemon/fakeidentd.ii
==============================================================================
--- initng/initfiles/daemon/fakeidentd.ii (original)
+++ initng/initfiles/daemon/fakeidentd.ii Mon Nov 7 23:34:57 2005
@@ -2,7 +2,7 @@
daemon daemon/fakeidentd {
need = system/initial system/checkroot
require_network
- daemon = /usr/sbin/fakeidentd
+ daemon = @/usr/sbin/fakeidentd@
daemon_args = mafteah
pid_file = /var/run/fakeidentd.pid
}
Modified: initng/initfiles/daemon/famd.ii
==============================================================================
--- initng/initfiles/daemon/famd.ii (original)
+++ initng/initfiles/daemon/famd.ii Mon Nov 7 23:34:57 2005
@@ -1,6 +1,6 @@
daemon daemon/famd {
need = daemon/portmap
- daemon = /usr/sbin/famd
+ daemon = @/usr/sbin/famd@
daemon_args = -T 0 -f -c /etc/fam.conf
}
Modified: initng/initfiles/daemon/fcron.ii
==============================================================================
--- initng/initfiles/daemon/fcron.ii (original)
+++ initng/initfiles/daemon/fcron.ii Mon Nov 7 23:34:57 2005
@@ -1,5 +1,5 @@
daemon daemon/fcron {
need = system/initial system/mountroot net/lo
- daemon = /usr/sbin/fcron
+ daemon = @/usr/sbin/fcron@
# daemon_args =
}
Modified: initng/initfiles/daemon/fetchmail.ii
==============================================================================
--- initng/initfiles/daemon/fetchmail.ii (original)
+++ initng/initfiles/daemon/fetchmail.ii Mon Nov 7 23:34:57 2005
@@ -5,6 +5,6 @@
daemon daemon/fetchmail {
need = system/initial system/mountfs daemon/sendmail
require_network
- daemon = /usr/bin/fetchmail
+ daemon = @/usr/bin/fetchmail@
daemon_args = -f /etc/fetchmailrc
}
Modified: initng/initfiles/daemon/gdm.ii
==============================================================================
--- initng/initfiles/daemon/gdm.ii (original)
+++ initng/initfiles/daemon/gdm.ii Mon Nov 7 23:34:57 2005
@@ -2,8 +2,7 @@
daemon daemon/gdm {
need = system/initial system/mountfs system/hostname net/lo system/modules system/bootmisc
use = daemon/xfs system/static-modules system/coldplug system/netmount
- daemon = /usr/sbin/gdm
- daemon = /usr/bin/gdm
+ daemon = @/usr/sbin/gdm@
daemon_args = -nodaemon
#pid_file = /var/run/gdm.pid
}
Modified: initng/initfiles/daemon/getty.ii
==============================================================================
--- initng/initfiles/daemon/getty.ii (original)
+++ initng/initfiles/daemon/getty.ii Mon Nov 7 23:34:57 2005
@@ -2,7 +2,7 @@
daemon daemon/getty/tty1 {
#*/
need = system/mountroot
- daemon = /sbin/getty
+ daemon = @/sbin/getty@
daemon_args = 38400 $NAME
respawn = yes
last = yes
@@ -11,7 +11,7 @@
daemon daemon/getty/* {
#*/
need = system/mountroot
- daemon = /sbin/getty
+ daemon = @/sbin/getty@
daemon_args = 38400 $NAME
respawn = yes
}
Modified: initng/initfiles/daemon/gpm.ii
==============================================================================
--- initng/initfiles/daemon/gpm.ii (original)
+++ initng/initfiles/daemon/gpm.ii Mon Nov 7 23:34:57 2005
@@ -1,7 +1,7 @@
daemon daemon/gpm {
need = system/initial system/mountfs
- daemon = /usr/sbin/gpm
+ daemon = @/usr/sbin/gpm@
daemon_args = -m /dev/input/mice -t ps2 -Rraw
pid_file = /var/run/gpm.pid
Modified: initng/initfiles/daemon/hald.ii
==============================================================================
--- initng/initfiles/daemon/hald.ii (original)
+++ initng/initfiles/daemon/hald.ii Mon Nov 7 23:34:57 2005
@@ -14,9 +14,9 @@
# We have to probe what version it is, they use diffrent arguments.
/usr/sbin/hald --help 2>&1 | grep retain-privileges &> /dev/null
if [ "$?" = "0" ]; then
- exec /usr/sbin/hald --daemon=no --retain-privileges &> /dev/null
+ exec @/usr/sbin/hald@ --daemon=no --retain-privileges &> /dev/null
else
- exec /usr/sbin/hald --daemon=no --drop-privileges &> /dev/null
+ exec @/usr/sbin/hald@ --daemon=no --drop-privileges &> /dev/null
fi
echo "HALD failed to start!"
exit 1
Modified: initng/initfiles/daemon/hddtemp.ii
==============================================================================
--- initng/initfiles/daemon/hddtemp.ii (original)
+++ initng/initfiles/daemon/hddtemp.ii Mon Nov 7 23:34:57 2005
@@ -21,8 +21,8 @@
DAEMON_ARG="-d -l $INTERFACE -p $PORT -s $SEPARATOR"
fi
-if [ ! -x "/usr/sbin/hddtemp" ]; then
- echo "Could not find /usr/sbin/hddtemp"
+if [ ! -x "@/usr/sbin/hddtemp@" ]; then
+ echo "Could not find @/usr/sbin/hddtemp@"
exit 1
fi
@@ -39,7 +39,7 @@
done
if [ -n "$DISKS_LIST" ] || [ -n "$DISKS_NOPROBE" ] ; then
- /usr/sbin/hddtemp $DAEMON_ARG $SYSLOG_ARG $OPTIONS $DISKS_NOPROBE $DISKS_LIST
+ @/usr/sbin/hddtemp@ $DAEMON_ARG $SYSLOG_ARG $OPTIONS $DISKS_NOPROBE $DISKS_LIST
fi
# sleep 1 sec and then get pid
Modified: initng/initfiles/daemon/hpiod.ii
==============================================================================
--- initng/initfiles/daemon/hpiod.ii (original)
+++ initng/initfiles/daemon/hpiod.ii Mon Nov 7 23:34:57 2005
@@ -2,6 +2,6 @@
daemon daemon/hpiod {
need = system/initial system/mountfs net/lo
- daemon = /usr/sbin/hpiod
+ daemon = @/usr/sbin/hpiod@
pid_file = /var/run/hpiod.pid
}
Modified: initng/initfiles/daemon/hpssd.ii
==============================================================================
--- initng/initfiles/daemon/hpssd.ii (original)
+++ initng/initfiles/daemon/hpssd.ii Mon Nov 7 23:34:57 2005
@@ -1,5 +1,5 @@
daemon daemon/hpssd {
need = system/initial system/mountfs daemon/hpiod
- daemon = /usr/share/hplip/hpssd.py
+ daemon = @/usr/share/hplip/hpssd.py@
pid_file = /var/run/hpssd.pid
}
Modified: initng/initfiles/daemon/ifplugd.ii
==============================================================================
--- initng/initfiles/daemon/ifplugd.ii (original)
+++ initng/initfiles/daemon/ifplugd.ii Mon Nov 7 23:34:57 2005
@@ -5,7 +5,7 @@
#*/
need = system/mountfs system/modules
use = system/static-modules system/coldplug
- daemon = /usr/sbin/ifplugd
+ daemon = @/usr/sbin/ifplugd@
daemon_args = -i $NAME
pid_file = /var/run/ifplugd.$NAME.pid
}
@@ -17,7 +17,7 @@
start {
for IF in `cat /proc/net/dev | awk 'BEGIN { FS=":" } /eth|wlan/ { gsub(/\W/,"",$1); print $1;}' ` ; do
- /sbin/ngc -u daemon/ifplugd/$IF &> /dev/null
+ @/sbin/ngc@ -u daemon/ifplugd/$IF &> /dev/null
done
}
Modified: initng/initfiles/daemon/instant-gdm.ii
==============================================================================
--- initng/initfiles/daemon/instant-gdm.ii (original)
+++ initng/initfiles/daemon/instant-gdm.ii Mon Nov 7 23:34:57 2005
@@ -9,18 +9,14 @@
nice = -4;
daemon {
echo "STARTING INSTANT-GDM"
- modprobe mousedev 2>&1 >/dev/null
- modprobe nvidia 2>&1 >/dev/null
- modprobe fglrx 2>&1 >/dev/null
+ @modprobe@ mousedev 2>&1 >/dev/null
+ @modprobe@ nvidia 2>&1 >/dev/null
+ @modprobe@ fglrx 2>&1 >/dev/null
if [ -e /sys/class/input/mice/dev ]; then
- mkdir -p /dev/input
- mknod /dev/input/mice c 13 63 &>/dev/null
+ @mkdir@ -p /dev/input
+ @mknod@ /dev/input/mice c 13 63 &>/dev/null
fi
echo "STARTING INSTANT-GDM-DAEMON"
-#ifd pingwinek
- exec /usr/sbin/gdm -nodaemon
-#elsed
- exec /usr/bin/gdm -nodaemon
-#endd
+ exec @/usr/bin/gdm@ -nodaemon
}
}
Modified: initng/initfiles/daemon/ivman.ii
==============================================================================
--- initng/initfiles/daemon/ivman.ii (original)
+++ initng/initfiles/daemon/ivman.ii Mon Nov 7 23:34:57 2005
@@ -2,5 +2,5 @@
daemon daemon/ivman {
need = system/initial system/mountfs daemon/dbus daemon/hald
pid_file = /var/run/ivman.pid
- daemon = /usr/bin/ivman
+ daemon = @/usr/bin/ivman@
}
More information about the Initng-svn
mailing list