[Initng-svn] r1985 - in initng/initfiles: daemon system
svn at initng.thinktux.net
svn at initng.thinktux.net
Tue Nov 8 00:15:47 CET 2005
Author: jimmy
Date: Tue Nov 8 00:15:46 2005
New Revision: 1985
Modified:
initng/initfiles/daemon/portmap.ii
initng/initfiles/daemon/rsyncd.ii
initng/initfiles/system/acct.ii
initng/initfiles/system/alsasound.ii
initng/initfiles/system/aumix.ii
initng/initfiles/system/bootmisc.ii
Log:
Started converting in system.
Modified: initng/initfiles/daemon/portmap.ii
==============================================================================
--- initng/initfiles/daemon/portmap.ii (original)
+++ initng/initfiles/daemon/portmap.ii Tue Nov 8 00:15:46 2005
@@ -12,7 +12,7 @@
if [[ -f /etc/default/portmap ]]; then
source /etc/default/portmap
fi
- exec @/sbin/pormap@ ${OPTIONS}
+ exec @/sbin/portmap@ ${OPTIONS}
#elsed
exec @/sbin/portmap@
#endd
Modified: initng/initfiles/daemon/rsyncd.ii
==============================================================================
--- initng/initfiles/daemon/rsyncd.ii (original)
+++ initng/initfiles/daemon/rsyncd.ii Tue Nov 8 00:15:46 2005
@@ -2,7 +2,7 @@
daemon/rsyncd {
need = system/initial system/mountroot net/lo
require_network
- daemon = @/usr/sbin/rsycd@
+ daemon = @/usr/sbin/rsyncd@
# daemon_args = --daemon
# pid_file = /var/run/rsyncd.pid
}
Modified: initng/initfiles/system/acct.ii
==============================================================================
--- initng/initfiles/system/acct.ii (original)
+++ initng/initfiles/system/acct.ii Tue Nov 8 00:15:46 2005
@@ -4,9 +4,9 @@
start {
touch /var/account/pacct
- chmod 600 /var/account/pacct
- /usr/sbin/accton /var/account/pacct
+ @chmod@ 600 /var/account/pacct
+ @/usr/sbin/accton@ /var/account/pacct
}
- stop = /usr/sbin/accton
+ stop = @/usr/sbin/accton@
}
Modified: initng/initfiles/system/alsasound.ii
==============================================================================
--- initng/initfiles/system/alsasound.ii (original)
+++ initng/initfiles/system/alsasound.ii Tue Nov 8 00:15:46 2005
@@ -58,16 +58,16 @@
opts="${opts} save"
# List of drivers for each card.
-DRIVERS="$(modprobe -c | grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | awk '{print $2}')"
+DRIVERS="$(@modprobe@ -c | @grep@ -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | @awk@ '{print $2}')"
# Fall back on the automated aliases if we don't have ALSA configured properly...
-if [ -z "${DRIVERS}" ] && ! ([ -d /proc/asound ] && [ -z "$(grep ' no soundcards ' /proc/asound/cards)" ]); then
+if [ -z "${DRIVERS}" ] && ! ([ -d /proc/asound ] && [ -z "$(@grep@ ' no soundcards ' /proc/asound/cards)" ]); then
echo "Could not detect custom ALSA settings. Loading all detected alsa drivers."
- DRIVERS="$(modprobe -c | grep pci: | awk '{ print $3 }' | grep snd.* | sort | uniq)"
+ DRIVERS="$(@modprobe@ -c | @grep@ pci: | @awk@ '{ print $3 }' | @grep@ snd.* | sort | uniq)"
[ -z "${DRIVERS}" ] && echo "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?"
fi
-if modprobe -c | grep -q "snd.*oss$" ; then
+if @modprobe@ -c | @grep@ -q "snd.*oss$" ; then
# Test for use of OSS
OSS="$(modprobe -l | grep "snd.*oss" | sed -e "s:\/.*\/::" -e "s:\..*::")"
# Add oss modules to list
@@ -79,17 +79,17 @@
# We want to ensure snd-seq is loaded as it is needed for things like
# timidity even if we don't use a real sequencer.
-DRIVERS="${DRIVERS} $(modprobe -l | grep "snd.seq\." | sed -e "s:\/.*\/::" -e "s:\..*::")"
+DRIVERS="${DRIVERS} $(@modprobe@ -l | grep "snd.seq\." | sed -e "s:\/.*\/::" -e "s:\..*::")"
# We want to ensure snd-ioctl32 is loaded as it is needed for 32bit
# compatibility
-DRIVERS="${DRIVERS} $(modprobe -l | grep "snd.ioctl32\." | sed -e "s:\/.*\/::" -e "s:\..*::")"
+DRIVERS="${DRIVERS} $(@modprobe@ -l | grep "snd.ioctl32\." | sed -e "s:\/.*\/::" -e "s:\..*::")"
for DRIVER in ${DRIVERS}
do
if [ ! "${DRIVER}" = off ]; then
echo " Loading: ${DRIVER} ..."
- /sbin/modprobe ${DRIVER}
+ @/sbin/modprobe@ ${DRIVER}
fi
done
@@ -98,7 +98,7 @@
for SEQUENCER in ${SEQUENCERS}
do
echo " Loading: ${SEQUENCER} ..."
- /sbin/modprobe ${SEQUENCER}
+ @/sbin/modprobe@ ${SEQUENCER}
done
fi
@@ -118,16 +118,16 @@
}
stop {
-LOADED_MODULES="$(/sbin/lsmod | grep -E "^snd" | awk '{print $1}')"
+LOADED_MODULES="$(@/sbin/lsmod@ | @grep@ -E "^snd" | @awk@ '{print $1}')"
for MODULE in ${LOADED_MODULES}
do
- /sbin/rmmod ${MODULE} >& /dev/null
+ @/sbin/rmmod@ ${MODULE} >& /dev/null
done
-/sbin/rmmod soundcore >& /dev/null
-/sbin/rmmod gameport >& /dev/null
+@/sbin/rmmod@ soundcore >& /dev/null
+@/sbin/rmmod@ gameport >& /dev/null
# Return success if the modules are unloaded
-test -z "$(/sbin/lsmod | grep -E "^snd" | awk '{print $1}')"
+test -z "$(@/sbin/lsmod@ | @grep@ -E "^snd" | @awk@ '{print $1}')"
}
}
Modified: initng/initfiles/system/aumix.ii
==============================================================================
--- initng/initfiles/system/aumix.ii (original)
+++ initng/initfiles/system/aumix.ii Tue Nov 8 00:15:46 2005
@@ -4,7 +4,7 @@
need = system/initial system/mountfs
start {
-if [ -z "`egrep 'sound|OSS' /proc/devices`" ] && [ ! -d /proc/asound ]
+if [ -z "`@egrep@ 'sound|OSS' /proc/devices`" ] && [ ! -d /proc/asound ]
then
echo "Sound support has not been compiled into the kernel,"
echo "or is disabled. Please check that the correct modules"
@@ -18,16 +18,16 @@
fi
if [ -f /etc/aumixrc ] ; then
echo "Loading Mixer settings"
- /usr/bin/aumix -f /etc/aumixrc -L >/dev/null 2>&1
+ @/usr/bin/aumix@ -f /etc/aumixrc -L >/dev/null 2>&1
else
echo "Setting Mixer settings"
- /usr/bin/aumix -v75 -c75 -w75 >/dev/null 2>&1
+ @/usr/bin/aumix@ -v75 -c75 -w75 >/dev/null 2>&1
fi
exit $?
}
stop {
-if [ -z "`egrep 'sound|OSS' /proc/devices`" ] && [ ! -d /proc/asound ]
+if [ -z "`@egrep@ 'sound|OSS' /proc/devices`" ] && [ ! -d /proc/asound ]
then
echo "Sound support has not been compiled into the kernel,"
echo "or is disabled. Please check that the correct modules"
@@ -41,7 +41,7 @@
fi
echo "Saving Mixer settings"
-/usr/bin/aumix -f /etc/aumixrc -S >/dev/null 2>&1
+@/usr/bin/aumix@ -f /etc/aumixrc -S >/dev/null 2>&1
exit $?
}
Modified: initng/initfiles/system/bootmisc.ii
==============================================================================
--- initng/initfiles/system/bootmisc.ii (original)
+++ initng/initfiles/system/bootmisc.ii Tue Nov 8 00:15:46 2005
@@ -15,55 +15,55 @@
fi
if [ -e /etc/sysctl.conf ] ; then
- /sbin/sysctl -p /etc/sysctl.conf 2>&1 >/dev/null &
+ @/sbin/sysctl@ -p /etc/sysctl.conf 2>&1 >/dev/null &
fi
-if [ -x /sbin/env-update.sh ] ; then
+if [ -x @/sbin/env-update.sh@ ] ; then
if [ /etc/env.d -nt /etc/profile.env ]
then
echo "Updating environment ..."
- /sbin/env-update.sh -u > /dev/null &
+ @/sbin/env-update.sh@ -u > /dev/null &
fi
fi
# Setup login records
echo -n "" > /var/run/utmp
-touch /var/log/wtmp &>/dev/null
-chgrp utmp /var/run/utmp /var/log/wtmp &>/dev/null
-chmod 0664 /var/run/utmp /var/log/wtmp &>/dev/null
+ at touch@ /var/log/wtmp &>/dev/null
+ at chgrp@ utmp /var/run/utmp /var/log/wtmp &>/dev/null
+ at chmod@ 0664 /var/run/utmp /var/log/wtmp &>/dev/null
# Remove /var/run/utmpx (bug from the past)
-rm -f /var/run/utmpx &> /dev/null
+ at rm@ -f /var/run/utmpx &> /dev/null
# Reset pam_console permissions
if [ -x /sbin/pam_console_apply ] && [ ! -c /dev/.devfsd ] ; then
- /sbin/pam_console_apply -r >/dev/null &
+ @/sbin/pam_console_apply@ -r >/dev/null &
fi
#
# Clean up /tmp directory
#
-rm -f /tmp/.X*-lock /tmp/esrv* /tmp/kio* /tmp/jpsock.* /tmp/.fam* 2>&1 >/dev/null &
-rm -rf /tmp/.esd* /tmp/orbit-* /tmp/ssh-* /tmp/ksocket-* 2>&1 >/dev/null &
+ at rm@ -f /tmp/.X*-lock /tmp/esrv* /tmp/kio* /tmp/jpsock.* /tmp/.fam* 2>&1 >/dev/null &
+ at rm@ -rf /tmp/.esd* /tmp/orbit-* /tmp/ssh-* /tmp/ksocket-* 2>&1 >/dev/null &
# Make sure our X11 stuff have the correct permissions
-rm -rf /tmp/.*-unix ; mkdir -p /tmp/.{ICE,X11}-unix ; chmod 1777 /tmp/.{ICE,X11}-unix 2>&1 >/dev/null &
+ at rm@ -rf /tmp/.*-unix ; mkdir -p /tmp/.{ICE,X11}-unix ; chmod 1777 /tmp/.{ICE,X11}-unix 2>&1 >/dev/null &
#
# Clean up /var/lock and /var/run
#
-find /var/run/ ! -type d ! -name utmp ! -name innd.pid ! -name random-seed -exec rm \{\} \;
-find /var/lock -type f -exec rm \{\} \;
+ at find@ /var/run/ ! -type d ! -name utmp ! -name innd.pid ! -name random-seed -exec @rm@ \{\} \;
+ at find@ /var/lock -type f -exec @rm@ \{\} \;
#
# Create an 'after-boot' dmesg log
#
-touch /var/log/dmesg > /dev/null &
-chmod 640 /var/log/dmesg >/dev/null &
-dmesg > /var/log/dmesg &
+ at touch@ /var/log/dmesg > /dev/null &
+ at chmod@ 640 /var/log/dmesg >/dev/null &
+ at dmesg@ > /var/log/dmesg &
#
# Check for /etc/resolv.conf, and create if missing
#
-[ -f /etc/resolv.conf ] || touch /etc/resolv.conf 2>&1 >/dev/null &
+[ -f /etc/resolv.conf ] || @touch@ /etc/resolv.conf 2>&1 >/dev/null &
More information about the Initng-svn
mailing list