[Initng-svn] r1983 - initng/initfiles/daemon
svn at initng.thinktux.net
svn at initng.thinktux.net
Mon Nov 7 23:52:58 CET 2005
Author: jimmy
Date: Mon Nov 7 23:52:56 2005
New Revision: 1983
Modified:
initng/initfiles/daemon/kdm.ii
initng/initfiles/daemon/klogd.ii
initng/initfiles/daemon/lighttpd.ii
initng/initfiles/daemon/mDNSResponder.ii
initng/initfiles/daemon/mdnsd.ii
initng/initfiles/daemon/metalog.ii
initng/initfiles/daemon/mingetty.ii
initng/initfiles/daemon/mpd.ii
initng/initfiles/daemon/mysql.ii
initng/initfiles/daemon/nifd.ii
initng/initfiles/daemon/nscd.ii
initng/initfiles/daemon/ntpd.ii
initng/initfiles/daemon/oidentd.ii
initng/initfiles/daemon/openvpn.ii
initng/initfiles/daemon/portmap.ii
initng/initfiles/daemon/postgres.ii
initng/initfiles/daemon/powernowd.ii
initng/initfiles/daemon/printconf.ii
initng/initfiles/daemon/privoxy.ii
initng/initfiles/daemon/proftpd.ii
initng/initfiles/daemon/pump.ii
initng/initfiles/daemon/rp-pppoe.ii
initng/initfiles/daemon/rsyncd.ii
initng/initfiles/daemon/samba.ii
initng/initfiles/daemon/sendmail.ii
initng/initfiles/daemon/slapd.ii
initng/initfiles/daemon/slmodemd.ii
initng/initfiles/daemon/spamd.ii
initng/initfiles/daemon/splash_update.ii
initng/initfiles/daemon/sshd.ii
initng/initfiles/daemon/svnserve.ii
initng/initfiles/daemon/syslog-ng.ii
initng/initfiles/daemon/syslogd.ii
initng/initfiles/daemon/udhcpc.ii
initng/initfiles/daemon/vixie-cron.ii
initng/initfiles/daemon/vmware.ii
initng/initfiles/daemon/wdm.ii
initng/initfiles/daemon/wpa_cli.ii
initng/initfiles/daemon/wpa_supplicant.ii
initng/initfiles/daemon/xdm.ii
initng/initfiles/daemon/xfs.ii
initng/initfiles/daemon/xinetd.ii
Log:
More daemons converted, please test.
Modified: initng/initfiles/daemon/kdm.ii
==============================================================================
--- initng/initfiles/daemon/kdm.ii (original)
+++ initng/initfiles/daemon/kdm.ii Mon Nov 7 23:52:56 2005
@@ -2,7 +2,6 @@
daemon daemon/kdm {
need = system/initial system/mountfs system/hostname net/lo system/modules
use = daemon/xfs system/static-modules system/coldplug system/netmount
- daemon = /usr/bin/kdm
- daemon = /usr/kde/3.4/bin/kdm
+ daemon = @/usr/bin/kdm@
daemon_args = -nodaemon
}
Modified: initng/initfiles/daemon/klogd.ii
==============================================================================
--- initng/initfiles/daemon/klogd.ii (original)
+++ initng/initfiles/daemon/klogd.ii Mon Nov 7 23:52:56 2005
@@ -4,18 +4,11 @@
daemon daemon/klogd {
need = system/initial daemon/syslogd system/bootmisc
#ifd debian
+ env_file = /etc/default/klogd
daemon {
- binpath=/sbin/klogd
-
- [ -r /etc/default/klogd ] && . /etc/default/klogd
-
- exec $binpath -n $KLOGD_OPTIONS
+ exec @/usr/sbin/klogd@ /u -n $KLOGD_OPTIONS
}
-#elsed gentoo
- daemon = /usr/sbin/klogd
- daemon_args = -n -2
#elsed
- daemon = /sbin/klogd
+ daemon = @/usr/sbin/klogd@
daemon_args = -n -2
-#endd
}
Modified: initng/initfiles/daemon/lighttpd.ii
==============================================================================
--- initng/initfiles/daemon/lighttpd.ii (original)
+++ initng/initfiles/daemon/lighttpd.ii Mon Nov 7 23:52:56 2005
@@ -2,6 +2,6 @@
need = system/localmount system/modules system/hostname net/eth0
use = system/static-modules system/coldplug
require_network
- daemon = /usr/sbin/lighttpd
+ daemon = @/usr/sbin/lighttpd@
daemon_args = -D -f /etc/lighttpd/lighttpd.conf
}
Modified: initng/initfiles/daemon/mDNSResponder.ii
==============================================================================
--- initng/initfiles/daemon/mDNSResponder.ii (original)
+++ initng/initfiles/daemon/mDNSResponder.ii Mon Nov 7 23:52:56 2005
@@ -2,6 +2,6 @@
daemon daemon/mDNSResponder {
need = system/initial system/mountroot daemon/nifd
require_network
- daemon = /usr/bin/mDNSResponder
+ daemon = @/usr/bin/mDNSResponder@
pid_file = /var/run/mDNSResponder.pid
}
Modified: initng/initfiles/daemon/mdnsd.ii
==============================================================================
--- initng/initfiles/daemon/mdnsd.ii (original)
+++ initng/initfiles/daemon/mdnsd.ii Mon Nov 7 23:52:56 2005
@@ -1,5 +1,5 @@
daemon daemon/mdnsd {
- daemon = /usr/sbin/mdnsd
+ daemon = @/usr/sbin/mdnsd@
pid_file = /var/run/mdnsd.pid
}
Modified: initng/initfiles/daemon/metalog.ii
==============================================================================
--- initng/initfiles/daemon/metalog.ii (original)
+++ initng/initfiles/daemon/metalog.ii Mon Nov 7 23:52:56 2005
@@ -2,7 +2,7 @@
daemon daemon/metalog {
need = system/initial system/clock system/hostname system/mountfs
#provide = logger
- daemon = /usr/sbin/metalog
+ daemon = @/usr/sbin/metalog@
daemon_args = -B -p /var/run/metalog.pid
#todo, daemons are better off using pidfiles than --nofork stuff.
# pid_file = /var/run/metalog.pid
Modified: initng/initfiles/daemon/mingetty.ii
==============================================================================
--- initng/initfiles/daemon/mingetty.ii (original)
+++ initng/initfiles/daemon/mingetty.ii Mon Nov 7 23:52:56 2005
@@ -1,6 +1,6 @@
daemon daemon/mingetty/tty1 {
need = system/mountfs system/issue
- daemon = /sbin/mingetty
+ daemon = @/sbin/mingetty@
daemon_args = $NAME
respawn
last
@@ -8,7 +8,7 @@
daemon daemon/mingetty/* {
need = system/mountfs system/issue
- daemon = /sbin/mingetty
+ daemon = @/sbin/mingetty@
daemon_args = $NAME
respawn
}
Modified: initng/initfiles/daemon/mpd.ii
==============================================================================
--- initng/initfiles/daemon/mpd.ii (original)
+++ initng/initfiles/daemon/mpd.ii Mon Nov 7 23:52:56 2005
@@ -1,6 +1,6 @@
daemon daemon/mpd {
need = system/alsasound system/mountfs
- daemon = /usr/bin/mpd
+ daemon = @/usr/bin/mpd@
daemon_args = --no-create-db /etc/mpd.conf
}
Modified: initng/initfiles/daemon/mysql.ii
==============================================================================
--- initng/initfiles/daemon/mysql.ii (original)
+++ initng/initfiles/daemon/mysql.ii Mon Nov 7 23:52:56 2005
@@ -3,7 +3,7 @@
need = system/initial system/mountfs net/lo
require_network
#virtual-use = dns
- daemon = /usr/bin/mysqld_safe
+ daemon = @/usr/bin/mysqld_safe@
#ifd pingwinek
#pid_file = /srv/mysql/mysql.pid
#elsed
Modified: initng/initfiles/daemon/nifd.ii
==============================================================================
--- initng/initfiles/daemon/nifd.ii (original)
+++ initng/initfiles/daemon/nifd.ii Mon Nov 7 23:52:56 2005
@@ -2,7 +2,7 @@
daemon daemon/nifd {
need = system/initial system/mountroot
require_network
- daemon = /usr/bin/nifd
+ daemon = @/usr/bin/nifd@
daemon_args = -n
pid_file = /var/run/nifd.pid
}
Modified: initng/initfiles/daemon/nscd.ii
==============================================================================
--- initng/initfiles/daemon/nscd.ii (original)
+++ initng/initfiles/daemon/nscd.ii Mon Nov 7 23:52:56 2005
@@ -1,6 +1,6 @@
daemon daemon/nscd {
need = system/initial system/mountroot
- daemon = /usr/sbin/nscd
+ daemon = @/usr/sbin/nscd@
pid_file = /var/run/nscd/nscd.pid
}
Modified: initng/initfiles/daemon/ntpd.ii
==============================================================================
--- initng/initfiles/daemon/ntpd.ii (original)
+++ initng/initfiles/daemon/ntpd.ii Mon Nov 7 23:52:56 2005
@@ -5,8 +5,7 @@
use = daemon/ntpdate
#virtual_use dns logger
#after ntp-client
- daemon = /usr/sbin/ntpd
- daemon = /usr/bin/ntpd
+ daemon = @/usr/sbin/ntpd@
daemon_args = -n
#-p /var/run/ntpd.pid
#pid_file = /var/run/ntpd.pid
Modified: initng/initfiles/daemon/oidentd.ii
==============================================================================
--- initng/initfiles/daemon/oidentd.ii (original)
+++ initng/initfiles/daemon/oidentd.ii Mon Nov 7 23:52:56 2005
@@ -28,5 +28,5 @@
- exec /usr/sbin/oidentd -i ${OPTIONS}
+ exec @/usr/sbin/oidentd@ -i ${OPTIONS}
}
Modified: initng/initfiles/daemon/openvpn.ii
==============================================================================
--- initng/initfiles/daemon/openvpn.ii (original)
+++ initng/initfiles/daemon/openvpn.ii Mon Nov 7 23:52:56 2005
@@ -3,7 +3,7 @@
#*/
need = system/initial system/mountroot
require_network
- daemon = /usr/sbin/openvpn
+ daemon = @/usr/sbin/openvpn@
daemon_args = --config /etc/openvpn/$NAME/local.conf --writepid /var/run/openvpn-$NAME.pid --cd /etc/openvpn/$NAME
}
@@ -12,11 +12,11 @@
start {
echo "Trying to load tun module if any ..."
-modprobe tun &> /dev/nul
+ at modprobe@ tun &> /dev/nul
if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
echo "Detected broken /dev/net/tun symlink, fixing..."
- rm /dev/net/tun
- ln -s /dev/misc/net/tun /dev/net/tun
+ @rm@ /dev/net/tun
+ @ln@ -s /dev/misc/net/tun /dev/net/tun
fi
if [ ! -d /etc/openvpn ]; then
@@ -29,7 +29,7 @@
do
if [ -d $VPN ] && [ -e $VPN/local.conf ]; then
echo "Starting openvpn for $VPN"
- /sbin/ngc -u daemon/openvpn/$VPN
+ @/sbin/ngc@ -u daemon/openvpn/$VPN
else
echo "Expected $VPNDIR/$VPN to be a directory containing a local.conf."
fi
Modified: initng/initfiles/daemon/portmap.ii
==============================================================================
--- initng/initfiles/daemon/portmap.ii (original)
+++ initng/initfiles/daemon/portmap.ii Mon Nov 7 23:52:56 2005
@@ -1,25 +1,20 @@
daemon daemon/portmap {
need = system/mountroot
require_network
- pid_file = /var/run/portmap.pid
+ pid_of = portmap
daemon {
#ifd gentoo
if [[ -f /etc/conf.d/portmap ]]; then
source /etc/conf.d/portmap
fi
- /sbin/portmap ${PORTMAP_OPTS}
+ exec @/sbin/portmap@ ${PORTMAP_OPTS}
#elsed debian
if [[ -f /etc/default/portmap ]]; then
source /etc/default/portmap
fi
- /sbin/pormap ${OPTIONS}
+ exec @/sbin/pormap@ ${OPTIONS}
#elsed
- /sbin/portmap
+ exec @/sbin/portmap@
#endd
-
- # Sleep one second, so that pormap can fork, so we are getting the right pid.
- sleep 1
- echo `pidof portmap` > /var/run/portmap.pid
- exit 0
}
}
Modified: initng/initfiles/daemon/postgres.ii
==============================================================================
--- initng/initfiles/daemon/postgres.ii (original)
+++ initng/initfiles/daemon/postgres.ii Mon Nov 7 23:52:56 2005
@@ -8,7 +8,7 @@
PGDATA="/var/lib/pgsql"
#endd
PGPORT="5432"
- su - postgres -c "/usr/bin/pg_ctl -D ${PGDATA} -p /usr/bin/postmaster -o '-p ${PGPORT}' start" < /dev/null
+ @su@ - postgres -c "@/usr/bin/pg_ctl@ -D ${PGDATA} -p @/usr/bin/postmaster@ -o '-p ${PGPORT}' start" < /dev/null
}
stop {
#ifd pingwinek
@@ -16,6 +16,6 @@
#elsed
PGDATA="/var/lib/pgsql"
#endd
- su - postgres -c "/usr/bin/pg_ctl stop -D ${PGDATA} -s -m fast"
+ @su@ - postgres -c "@/usr/bin/pg_ctl@ stop -D ${PGDATA} -s -m fast"
}
}
Modified: initng/initfiles/daemon/powernowd.ii
==============================================================================
--- initng/initfiles/daemon/powernowd.ii (original)
+++ initng/initfiles/daemon/powernowd.ii Mon Nov 7 23:52:56 2005
@@ -2,7 +2,7 @@
daemon daemon/powernowd {
need = system/initial system/mountfs
# use =
- daemon = /usr/sbin/powernowd
+ daemon = @/usr/sbin/powernowd@
daemon_args = "-q"
}
Modified: initng/initfiles/daemon/printconf.ii
==============================================================================
--- initng/initfiles/daemon/printconf.ii (original)
+++ initng/initfiles/daemon/printconf.ii Mon Nov 7 23:52:56 2005
@@ -1,8 +1,6 @@
service daemon/printconf {
need = system/initial system/mountfs
- start {
- /usr/sbin/printconf-backend
- }
+ start = @/usr/sbin/printconf-backend@
}
Modified: initng/initfiles/daemon/privoxy.ii
==============================================================================
--- initng/initfiles/daemon/privoxy.ii (original)
+++ initng/initfiles/daemon/privoxy.ii Mon Nov 7 23:52:56 2005
@@ -1,6 +1,6 @@
daemon daemon/privoxy {
need = system/initial system/clock system/mountfs net/lo
- daemon = /usr/sbin/privoxy
+ daemon = @/usr/sbin/privoxy@
daemon_args = --nodaemon --pidfile /var/run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
pid_file = /var/run/privoxy.pid
}
Modified: initng/initfiles/daemon/proftpd.ii
==============================================================================
--- initng/initfiles/daemon/proftpd.ii (original)
+++ initng/initfiles/daemon/proftpd.ii Mon Nov 7 23:52:56 2005
@@ -1,6 +1,6 @@
daemon daemon/proftpd {
need = system/initial system/mountfs net/lo
require_network
- daemon = /usr/sbin/proftpd
+ daemon = @/usr/sbin/proftpd@
pid_file = /var/run/proftpd.pid
}
Modified: initng/initfiles/daemon/pump.ii
==============================================================================
--- initng/initfiles/daemon/pump.ii (original)
+++ initng/initfiles/daemon/pump.ii Mon Nov 7 23:52:56 2005
@@ -1,7 +1,6 @@
daemon daemon/pump/* {
#*/
need = system/modules system/mountfs
- # daemon = /sbin/pump
daemon {
if [[ -e /etc/conf.d/net ]]; then
@@ -19,7 +18,7 @@
&& ${opts} != *' -h '*i && ${opts} != *' --hostname='* && ${d} != *' nohostname '* ]] \
&& opts="${opts} -h ${h}"
- /sbin/pump ${opts} -i ${NAME}
+ @/sbin/pump@ ${opts} -i ${NAME}
[[ $? != 0 ]] && exit $?
[[ ${d} == *' nontp '* ]] && exit 0
@@ -34,6 +33,6 @@
}
kill {
- /sbin/pump --release -i ${NAME}
+ @/sbin/pump@ --release -i ${NAME}
}
}
Modified: initng/initfiles/daemon/rp-pppoe.ii
==============================================================================
--- initng/initfiles/daemon/rp-pppoe.ii (original)
+++ initng/initfiles/daemon/rp-pppoe.ii Mon Nov 7 23:52:56 2005
@@ -1,6 +1,6 @@
daemon daemon/rp-pppoe {
# change eth0 to whatever device you use for rp-pppoe
need = net/eth0 system/initial system/static-modules system/mountfs
- daemon = /usr/sbin/adsl-start
- stop = /usr/sbin/adsl-stop
+ daemon = @/usr/sbin/adsl-start@
+ stop = @/usr/sbin/adsl-stop@
}
Modified: initng/initfiles/daemon/rsyncd.ii
==============================================================================
--- initng/initfiles/daemon/rsyncd.ii (original)
+++ initng/initfiles/daemon/rsyncd.ii Mon Nov 7 23:52:56 2005
@@ -2,7 +2,7 @@
daemon/rsyncd {
need = system/initial system/mountroot net/lo
require_network
- daemon = /usr/sbin/rsycd
+ daemon = @/usr/sbin/rsycd@
# daemon_args = --daemon
# pid_file = /var/run/rsyncd.pid
}
Modified: initng/initfiles/daemon/samba.ii
==============================================================================
--- initng/initfiles/daemon/samba.ii (original)
+++ initng/initfiles/daemon/samba.ii Mon Nov 7 23:52:56 2005
@@ -2,13 +2,13 @@
daemon daemon/samba/smbd {
need = system/initial system/mountroot
require_network
- daemon = /usr/sbin/smbd
+ daemon = @/usr/sbin/smbd@
daemon_args = -F
}
daemon daemon/samba/nmbd {
need = system/initial system/mountroot
require_network
- daemon = /usr/sbin/nmbd
+ daemon = @/usr/sbin/nmbd@
daemon_args = -F
}
Modified: initng/initfiles/daemon/sendmail.ii
==============================================================================
--- initng/initfiles/daemon/sendmail.ii (original)
+++ initng/initfiles/daemon/sendmail.ii Mon Nov 7 23:52:56 2005
@@ -9,17 +9,17 @@
require_network
daemon {
if test -x /usr/bin/make -a -f /etc/mail/Makefile ; then
- make all -C /etc/mail -s > /dev/null
+ @make@ all -C /etc/mail -s > /dev/null
else
for i in virtusertable access domaintable mailertable ; do
if [ -f /etc/mail/$i ] ; then
- makemap hash /etc/mail/$i < /etc/mail/$i
+ @makemap@ hash /etc/mail/$i < /etc/mail/$i
fi
done
fi
- /usr/bin/newaliases > /dev/null 2>&1
+ @/usr/bin/newaliases@ > /dev/null 2>&1
- exec /usr/sbin/sendmail -q1h -bD
+ exec @/usr/sbin/sendmail@ -q1h -bD
}
}
Modified: initng/initfiles/daemon/slapd.ii
==============================================================================
--- initng/initfiles/daemon/slapd.ii (original)
+++ initng/initfiles/daemon/slapd.ii Mon Nov 7 23:52:56 2005
@@ -1,7 +1,7 @@
daemon/slapd {
need = system/initial system/mountfs net/lo
- daemon = /usr/lib/openldap/slapd
+ daemon = @/usr/lib/openldap/slapd@
daemon_args = -u ldap -g ldap
pid_file = /var/run/openldap/slapd.pid
}
Modified: initng/initfiles/daemon/slmodemd.ii
==============================================================================
--- initng/initfiles/daemon/slmodemd.ii (original)
+++ initng/initfiles/daemon/slmodemd.ii Mon Nov 7 23:52:56 2005
@@ -1,7 +1,7 @@
daemon daemon/slmodemd {
need = system/mountroot system/alsasound
- daemon = /usr/sbin/slmodemd
+ daemon = @/usr/sbin/slmodemd@
daemon_args = --country=SWEDEN --group=dialout --alsa=modem:1
}
Modified: initng/initfiles/daemon/spamd.ii
==============================================================================
--- initng/initfiles/daemon/spamd.ii (original)
+++ initng/initfiles/daemon/spamd.ii Mon Nov 7 23:52:56 2005
@@ -6,6 +6,6 @@
daemon daemon/spamd {
need = system/initial system/mountroot net/lo
- daemon = /usr/bin/spamd
+ daemon = @/usr/bin/spamd@
daemon_args = -c -m1 -H
}
Modified: initng/initfiles/daemon/splash_update.ii
==============================================================================
--- initng/initfiles/daemon/splash_update.ii (original)
+++ initng/initfiles/daemon/splash_update.ii Mon Nov 7 23:52:56 2005
@@ -1,4 +1,4 @@
daemon daemon/splash_update {
- daemon = /sbin/splash_update
+ daemon = @/sbin/splash_update@
}
Modified: initng/initfiles/daemon/sshd.ii
==============================================================================
--- initng/initfiles/daemon/sshd.ii (original)
+++ initng/initfiles/daemon/sshd.ii Mon Nov 7 23:52:56 2005
@@ -2,7 +2,7 @@
daemon daemon/sshd {
need = system/initial system/mountfs system/hostname net/lo
require_network
- daemon = /usr/sbin/sshd
+ daemon = @/usr/sbin/sshd@
daemon_args = -D
# pid_file = /var/run/sshd.pid
}
Modified: initng/initfiles/daemon/svnserve.ii
==============================================================================
--- initng/initfiles/daemon/svnserve.ii (original)
+++ initng/initfiles/daemon/svnserve.ii Mon Nov 7 23:52:56 2005
@@ -2,7 +2,7 @@
daemon daemon/svnserve {
need = system/initial system/mountroot
- daemon = /usr/bin/svnserve
+ daemon = @/usr/bin/svnserve@
daemon_args = --daemon --root=/var/svn
pid_file = /var/run/svnserve.pid
}
Modified: initng/initfiles/daemon/syslog-ng.ii
==============================================================================
--- initng/initfiles/daemon/syslog-ng.ii (original)
+++ initng/initfiles/daemon/syslog-ng.ii Mon Nov 7 23:52:56 2005
@@ -3,10 +3,6 @@
need = system/initial system/clock system/hostname system/mountfs
#provide = logger
-#ifd debian
- daemon = /sbin/syslog-ng
-#elsed
- daemon = /usr/sbin/syslog-ng
-#endd
+ daemon = @/sbin/syslog-ng@
daemon_args = -F -p /var/run/syslog-ng.pid
}
Modified: initng/initfiles/daemon/syslogd.ii
==============================================================================
--- initng/initfiles/daemon/syslogd.ii (original)
+++ initng/initfiles/daemon/syslogd.ii Mon Nov 7 23:52:56 2005
@@ -11,26 +11,21 @@
create_xconsole()
{
if [ ! -e /dev/xconsole ]; then
- mknod -m 640 /dev/xconsole p
+ @mknod@ -m 640 /dev/xconsole p
else
- chmod 0640 /dev/xconsole
+ @chmod@ 0640 /dev/xconsole
fi
- chown root:adm /dev/xconsole
+ @chown@ root:adm /dev/xconsole
}
- binpath=/sbin/syslogd
- test -x $binpath || exit 0
+ test -x @/sbin/syslogd@ || exit 0
[ -r /etc/default/sysklogd ] && . /etc/default/sysklogd
create_xconsole
- exec $binpath -n $SYSKLOGD_OPTIONS
+ exec @/sbin/syslogd@ -n $SYSKLOGD_OPTIONS
}
-#elsed gentoo
- daemon = /usr/sbin/syslogd
- daemon_args = -n -m 0
-#elsed
- daemon = /sbin/syslogd
- daemon_args = -n -m 0
#endd
+ daemon = @/sbin/syslogd@
+ daemon_args = -n -m 0
}
Modified: initng/initfiles/daemon/udhcpc.ii
==============================================================================
--- initng/initfiles/daemon/udhcpc.ii (original)
+++ initng/initfiles/daemon/udhcpc.ii Mon Nov 7 23:52:56 2005
@@ -4,26 +4,15 @@
use = system/static-modules system/coldplug
pid_file = /var/run/udhcpc-$NAME.pid
#respawn
+ env_parse = /etc/conf.d/net
daemon {
- if [[ -e /etc/conf.d/net ]]; then
- source /etc/conf.d/net
- fi
eval opts=\" \$\{udhcpc_${NAME}\} \"
h=$( hostname )
[[ -n ${h} && ${h} != "(none)" && ${h} != "localhost" \
&& ${opts} != *' -h '* && ${d} != *' nohostname '* ]] \
&& opts="${opts} --hostname=${h}"
-#exec
-if [ -x /usr/sbin/udhcpc ] || [ -L /usr/sbin/udhcpc ]; then
- udhcpc_daemon="/usr/sbin/udhcpc"
-fi
-if [ -x /sbin/udhcpc ] || [ -L /sbin/udhcpc ]; then
- udhcpc_daemon="/sbin/udhcpc"
-fi
- echo "exec ${udhcpc_daemon} \${opts} --now --script=/lib/initng/scripts/net/udhcpc-wrapper --pidfile=/var/run/udhcpc-\${NAME}.pid --interface=\${NAME}"
- #[[ ${x:((${#x} - 5)):5} == "bound" ]]
-#endexec
+ exec @/usr/sbin/udhcpc@ ${opts} --now --script=/lib/initng/scripts/net/udhcpc-wrapper --pidfile=/var/run/udhcpc-${NAME}.pid --interface=${NAME}
}
}
Modified: initng/initfiles/daemon/vixie-cron.ii
==============================================================================
--- initng/initfiles/daemon/vixie-cron.ii (original)
+++ initng/initfiles/daemon/vixie-cron.ii Mon Nov 7 23:52:56 2005
@@ -5,5 +5,5 @@
#elsed
pid_file = /var/run/crond.pid
#endd
- daemon = /usr/sbin/cron
+ daemon = @/usr/sbin/cron@
}
Modified: initng/initfiles/daemon/vmware.ii
==============================================================================
--- initng/initfiles/daemon/vmware.ii (original)
+++ initng/initfiles/daemon/vmware.ii Mon Nov 7 23:52:56 2005
@@ -3,15 +3,15 @@
daemon daemon/vmnet {
need = system/initial system/mountfs
daemon {
- modprobe vmmon || exit 1
- modprobe vmnet || exit 1
+ @modprobe@ vmmon || exit 1
+ @modprobe@ vmnet || exit 1
- mknod -m 600 /dev/vmnet0 c 119 0
- mknod -m 600 /dev/vmnet1 c 119 1
- mknod -m 600 /dev/vmnet2 c 119 2
- mknod -m 600 /dev/vmnet3 c 119 3
+ @mknod@ -m 600 /dev/vmnet0 c 119 0
+ @mknod@ -m 600 /dev/vmnet1 c 119 1
+ @mknod@ -m 600 /dev/vmnet2 c 119 2
+ @mknod@ -m 600 /dev/vmnet3 c 119 3
- exec /opt/vmware/bin/vmnet-bridge /dev/vmnet0 eth0
+ exec @/opt/vmware/bin/vmnet-bridge@ /dev/vmnet0 eth0
}
}
Modified: initng/initfiles/daemon/wdm.ii
==============================================================================
--- initng/initfiles/daemon/wdm.ii (original)
+++ initng/initfiles/daemon/wdm.ii Mon Nov 7 23:52:56 2005
@@ -2,6 +2,6 @@
daemon daemon/wdm {
need = system/initial system/mountfs system/hostname net/lo system/modules
use = system/static-modules system/coldplug system/netmount
- daemon = /usr/bin/wdm
+ daemon = @/usr/bin/wdm@
daemon_args = -nodaemon
}
Modified: initng/initfiles/daemon/wpa_cli.ii
==============================================================================
--- initng/initfiles/daemon/wpa_cli.ii (original)
+++ initng/initfiles/daemon/wpa_cli.ii Mon Nov 7 23:52:56 2005
@@ -1,7 +1,7 @@
daemon daemon/wpa_cli/* {
need = system/mountfs
- daemon = /usr/bin/wpa_cli
+ daemon = @/usr/bin/wpa_cli@
daemon_args = -i$NAME -p/var/run/wpa_supplicant -B -P/var/run/wpa_cli-$NAME.pid -a/usr/sbin/wpa_cli.action
pid_file = /var/run/wpa_cli-$NAME.pid
#respawn
Modified: initng/initfiles/daemon/wpa_supplicant.ii
==============================================================================
--- initng/initfiles/daemon/wpa_supplicant.ii (original)
+++ initng/initfiles/daemon/wpa_supplicant.ii Mon Nov 7 23:52:56 2005
@@ -1,31 +1,28 @@
-service daemon/wpa_supplicant/* {
+daemon daemon/wpa_supplicant/* {
need = system/mountfs
- daemon = /usr/sbin/wpa_supplicant
pid_file = /var/run/wpa_supplicant-$NAME.pid
- #respawn
-
- start {
- source "/etc/initng/net/scripts/functions"
-
+ env_parse = /etc/initng/net/scripts/functions
+
+ daemon {
eval opts=\"\$\{wpa_supplicant_${ifvar}\} -i${iface} -c/etc/wpa_supplicant.conf -B\"
[[ -f /usr/sbin/wpa_cli.action ]] \
&& opts="${opts} -W -P/var/run/wpa_supplicant-${iface}.pid"
- /usr/sbin/wpa_supplicant ${opts}
+ @/usr/sbin/wpa_supplicant@ ${opts}
if [[ -f /usr/sbin/wpa_cli.action ]]; then
- ngc -u daemon/wpa_cli/${iface}
+ @ngc@ -u daemon/wpa_cli/${iface}
exit 0
fi
source "${libdir}/wpa_supplicant"
if ! wpa_supplicant_associate ; then
- wpa_cli -i${iface} terminate
+ @wpa_cli@ -i${iface} terminate
exit 1
fi
- ngc -u net/${iface}
+ @ngc@ -u net/${iface}
}
stop {
- pkill -f "/usr/sbin/wpa_supplicant .* -i${NAME} "
+ @pkill@ -f "/usr/sbin/wpa_supplicant .* -i${NAME} "
}
}
Modified: initng/initfiles/daemon/xdm.ii
==============================================================================
--- initng/initfiles/daemon/xdm.ii (original)
+++ initng/initfiles/daemon/xdm.ii Mon Nov 7 23:52:56 2005
@@ -2,7 +2,7 @@
daemon daemon/xdm {
need = system/initial system/mountfs system/hostname net/lo system/modules
use = system/static-modules system/coldplug system/netmount
- daemon = /usr/bin/xdm
+ daemon = @/usr/bin/xdm@
daemon_args = -nodaemon
# pid_file = /var/run/xdm.pid
}
Modified: initng/initfiles/daemon/xfs.ii
==============================================================================
--- initng/initfiles/daemon/xfs.ii (original)
+++ initng/initfiles/daemon/xfs.ii Mon Nov 7 23:52:56 2005
@@ -8,7 +8,7 @@
daemon daemon/xfs {
need = system/initial system/mountfs system/bootmisc
daemon {
- umask 133
+ @umask@ 133
FC_CACHE=/usr/bin/fc-cache
# chkfontpath output filtering, strips all of the junk output by
@@ -21,17 +21,17 @@
# If fonts.dir does not exist, or if there are files in the
# directory with a newer change time, regenerate fonts.dir, etc.
# Using "-cnewer" here fixes bug #53737
- if [ ! -e fonts.dir ] || [ -n "$(find . -maxdepth 1 -type f -cnewer fonts.dir -not -name 'fonts.cache*')" ]; then
- rm -f fonts.dir
- if ls | grep -iqs '\.ot[cf]$' ; then
+ if [ ! -e fonts.dir ] || [ -n "$(@find@ . -maxdepth 1 -type f -cnewer fonts.dir -not -name 'fonts.cache*')" ]; then
+ @rm@ -f fonts.dir
+ if @ls@ | @grep@ -iqs '\.ot[cf]$' ; then
# Opentype fonts found, generate fonts.scale and fonts.dir
- mkfontscale . && mkfontdir . &>/dev/null
- elif ls | grep -iqs '\.tt[cf]$' ; then
+ @mkfontscale@ . && @mkfontdir@ . &>/dev/null
+ elif @ls@ | @grep@ -iqs '\.tt[cf]$' ; then
# TrueType fonts found, generate fonts.scale and fonts.dir
- ttmkfdir -d . -o fonts.scale && mkfontdir . &>/dev/null
- elif ls | grep -Eiqsv '(^fonts\.(scale|alias|cache.*)$|.+(\.[ot]t[cf]|dir)$)' ; then
+ @ttmkfdir@ -d . -o fonts.scale && @mkfontdir@ . &>/dev/null
+ elif @ls@ | @grep@ -Eiqsv '(^fonts\.(scale|alias|cache.*)$|.+(\.[ot]t[cf]|dir)$)' ; then
# This directory contains non-TrueType/non-Opentype fonts
- mkfontdir . &>/dev/null
+ @mkfontdir@ . &>/dev/null
fi
fi
fi
@@ -44,12 +44,12 @@
FONT_UNIX_DIR=/tmp/.font-unix
# Clean out .font-unix dir, and recreate it with the proper ownership and
# permissions.
- rm -rf $FONT_UNIX_DIR
- mkdir $FONT_UNIX_DIR
- chown root:root $FONT_UNIX_DIR
- chmod 1777 $FONT_UNIX_DIR
+ @rm@ -rf $FONT_UNIX_DIR
+ @mkdir@ $FONT_UNIX_DIR
+ @chown@ root:root $FONT_UNIX_DIR
+ @chmod@ 1777 $FONT_UNIX_DIR
- exec /usr/X11R6/bin/xfs -droppriv -nodaemon
+ exec @/usr/X11R6/bin/xfs@ -droppriv -nodaemon
}
}
Modified: initng/initfiles/daemon/xinetd.ii
==============================================================================
--- initng/initfiles/daemon/xinetd.ii (original)
+++ initng/initfiles/daemon/xinetd.ii Mon Nov 7 23:52:56 2005
@@ -1,6 +1,6 @@
daemon daemon/xinetd {
require_network
need = system/initial system/mountfs
- daemon = /usr/sbin/xinetd
+ daemon = @/usr/sbin/xinetd@
daemon_args = -dontfork
}
More information about the Initng-svn
mailing list