aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-01-23 20:15:59 +0000
committerBill Nottingham <notting@redhat.com>2001-01-23 20:15:59 +0000
commit3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72 (patch)
tree0f0e78f3634deed3d2c36161430ecbdbd6b53bf2 /rc.d
parenta4a25465cd2844d72bf518188b813c009450f505 (diff)
downloadinitscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.tar
initscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.tar.gz
initscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.tar.bz2
initscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.tar.xz
initscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.zip
tag action, runcmd, etc. lines as well
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/init.d/functions20
-rwxr-xr-xrc.d/init.d/halt20
-rwxr-xr-xrc.d/init.d/netfs16
-rwxr-xr-xrc.d/init.d/network32
-rwxr-xr-xrc.d/init.d/random4
-rwxr-xr-xrc.d/rc6
-rwxr-xr-xrc.d/rc.sysinit70
7 files changed, 84 insertions, 84 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 4638b709..d9611b5c 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -115,9 +115,9 @@ daemon() {
# And start it up.
if [ -z "$daemon_user" ]; then
- nice -n $nicelevel initlog $INITLOG_ARGS -c "$*" && success "$base startup" || failure "$base startup"
+ nice -n $nicelevel initlog $INITLOG_ARGS -c "$*" && success $"$base startup" || failure $"$base startup"
else
- nice -n $nicelevel initlog $INITLOG_ARGS -c "su $daemon_user -c \"$*\"" && success "$base startup" || failure "$base startup"
+ nice -n $nicelevel initlog $INITLOG_ARGS -c "su $daemon_user -c \"$*\"" && success $"$base startup" || failure $"$base startup"
fi
}
@@ -171,18 +171,18 @@ killproc() {
fi
checkpid $pid >/dev/null 2>&1
RC=$?
- [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
+ [ $RC -eq 0 ] && failure $"$base shutdown" || success $"$base shutdown"
RC=$((! $RC))
# use specified level only
else
if checkpid $pid >/dev/null 2>&1; then
kill $killlevel $pid
RC=$?
- [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
+ [ $RC -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel"
fi
fi
else
- failure "$base shutdown"
+ failure $"$base shutdown"
fi
# Remove pid file if any.
@@ -292,7 +292,7 @@ success() {
else
# silly hack to avoid EPIPE killing rc.sysinit
trap "" SIGPIPE
- echo $"$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
+ echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
trap - SIGPIPE
fi
[ "$BOOTUP" != "verbose" ] && echo_success
@@ -306,7 +306,7 @@ failure() {
initlog $INITLOG_ARGS -n $0 -s "$1" -e 2
else
trap "" SIGPIPE
- echo $"$INITLOG_ARGS -n $0 -s \"$1\" -e 2" >&21
+ echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 2" >&21
trap - SIGPIPE
fi
[ "$BOOTUP" != "verbose" ] && echo_failure
@@ -320,7 +320,7 @@ passed() {
initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
else
trap "" SIGPIPE
- echo $"$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
+ echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
trap - SIGPIPE
fi
[ "$BOOTUP" != "verbose" ] && echo_passed
@@ -330,9 +330,9 @@ passed() {
# Run some action. Log its output.
action() {
STRING=$1
- echo -n $"$STRING "
+ echo -n "$STRING "
shift
- initlog $INITLOG_ARGS -c "$*" && success $"$STRING" || failure $"$STRING"
+ initlog $INITLOG_ARGS -c "$*" && action $"$STRING" || action $"$STRING"
rc=$?
echo
return $rc
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index c0671ef9..f54d69d1 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -43,9 +43,9 @@ esac
# Kill all processes.
[ "${BASH+bash}" = bash ] && enable kill
-runcmd "Sending all processes the TERM signal..." /sbin/killall5 -15
+action $"Sending all processes the TERM signal..." /sbin/killall5 -15
sleep 5
-runcmd "Sending all processes the KILL signal..." /sbin/killall5 -9
+action $"Sending all processes the KILL signal..." /sbin/killall5 -9
# Write to wtmp file before unmounting /var
halt -w
@@ -53,19 +53,19 @@ halt -w
# Save mixer settings, here for lack of a better place.
grep -q "\(sparcaudio\|sound\)" /proc/devices
if [ $? = 0 -a -x /bin/aumix-minimal ]; then
- runcmd "Saving mixer settings" /bin/aumix-minimal -f /etc/.aumixrc -S
+ action $"Saving mixer settings" /bin/aumix-minimal -f /etc/.aumixrc -S
fi
# Sync clock
-runcmd "Syncing hardware clock to system time" /sbin/hwclock --systohc
+action $"Syncing hardware clock to system time" /sbin/hwclock --systohc
# Turn off swap, then unmount file systems.
SWAPS=`awk '! /^Filename/ { print $1 }' /proc/swaps`
-[ -n "$SWAPS" ] && runcmd "Turning off swap: " swapoff $SWAPS
+[ -n "$SWAPS" ] && action $"Turning off swap: " swapoff $SWAPS
-[ -x /sbin/accton ] && runcmd "Turning off accounting: " /sbin/accton
+[ -x /sbin/accton ] && action $"Turning off accounting: " /sbin/accton
-[ -x /sbin/quotaoff ] && runcmd "Turning off quotas: " /sbin/quotaoff -a
+[ -x /sbin/quotaoff ] && action $"Turning off quotas: " /sbin/quotaoff -a
# Unmount file systems, killing processes if we have to.
sig=
@@ -74,9 +74,9 @@ remaining=`awk '!/(^#|proc|loopfs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mo
while [ -n "$remaining" -a "$retry" -gt 0 ]
do
if [ "$retry" -lt 3 ]; then
- runcmd "Unmounting file systems (retry): " umount -a -f -t noproc
+ action $"Unmounting file systems (retry): " umount -a -f -t noproc
else
- runcmd "Unmounting file systems: " umount -a -f -t noproc
+ action $"Unmounting file systems: " umount -a -f -t noproc
fi
sleep 2
remaining=`awk '!/(^#|proc|loopfs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts`
@@ -95,7 +95,7 @@ mount | awk '/ext2/ { print $3 }' | while read line; do
mount -n -o ro,remount $line
done
-runcmd "Unmounting proc file system: " umount /proc
+action $"Unmounting proc file system: " umount /proc
# Now halt or reboot.
echo $"$message"
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 8b51408c..1994ca17 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -35,12 +35,12 @@ case "$1" in
[ -n "$NFSFSTAB" ] &&
{
[ ! -f /var/lock/subsys/portmap ] && service portmap start
- action "Mounting NFS filesystems: " mount -a -t nfs
+ action $"Mounting NFS filesystems: " mount -a -t nfs
}
- [ -n "$SMBFSTAB" ] && action "Mounting SMB filesystems: " mount -a -t smbfs
- [ -n "$NCPFSTAB" ] && action "Mounting NCP filesystems: " mount -a -t ncpfs
+ [ -n "$SMBFSTAB" ] && action $"Mounting SMB filesystems: " mount -a -t smbfs
+ [ -n "$NCPFSTAB" ] && action $"Mounting NCP filesystems: " mount -a -t ncpfs
touch /var/lock/subsys/netfs
- action "Mounting other filesystems: " mount -a -t nonfs,smbfs,ncpfs
+ action $"Mounting other filesystems: " mount -a -t nonfs,smbfs,ncpfs
;;
stop)
[ -n "$NFSMTAB" ] && {
@@ -50,9 +50,9 @@ case "$1" in
while [ -n "$remaining" -a "$retry" -gt 0 ]
do
if [ "$retry" -lt 3 ]; then
- action "Unmounting NFS filesystems (retry): " umount -f -a -t nfs
+ action $"Unmounting NFS filesystems (retry): " umount -f -a -t nfs
else
- action "Unmounting NFS filesystems: " umount -f -a -t nfs
+ action $"Unmounting NFS filesystems: " umount -f -a -t nfs
fi
sleep 2
remaining=`awk '!/^#/ && $3 ~ /^nfs/ && $2 != "/" {print $2}' /proc/mounts`
@@ -63,8 +63,8 @@ case "$1" in
sig=-9
done
}
- [ -n "$SMBMTAB" ] && action "Unmounting SMB filesystems: " umount -a -t smbfs
- [ -n "$NCPMTAB" ] && action "Unmounting NCP filesystems: " umount -a -t ncpfs
+ [ -n "$SMBMTAB" ] && action $"Unmounting SMB filesystems: " umount -a -t smbfs
+ [ -n "$NCPMTAB" ] && action $"Unmounting NCP filesystems: " umount -a -t ncpfs
rm -f /var/lock/subsys/netfs
;;
status)
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 61ad8fb9..db379c53 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -44,9 +44,9 @@ interfaces=`ls ifcfg* | egrep -v '(ifcfg-lo|:|rpmsave|rpmorig|rpmnew)' | \
case "$1" in
start)
- action "Setting network parameters: " sysctl -p /etc/sysctl.conf
+ action $"Setting network parameters: " sysctl -p /etc/sysctl.conf
- action "Bringing up interface lo: " ./ifup ifcfg-lo
+ action $"Bringing up interface lo: " ./ifup ifcfg-lo
case "$IPX" in
yes|true)
@@ -82,7 +82,7 @@ case "$1" in
esac
}
- action "Bringing up interface $i: " ./ifup $i boot
+ action $"Bringing up interface $i: " ./ifup $i boot
fi
done
@@ -114,7 +114,7 @@ case "$1" in
for i in $interfaces ; do
if LC_ALL= LANG= ifconfig $i 2>/dev/null | grep -q " UP " >/dev/null 2>&1 ; then
- action "Shutting down interface $i: " ./ifdown $i boot
+ action $"Shutting down interface $i: " ./ifdown $i boot
fi
done
case "$IPX" in
@@ -128,12 +128,12 @@ case "$1" in
if [ -d /proc/sys/net/ipv4 ]; then
if [ -f /proc/sys/net/ipv4/ip_forward ]; then
if [ `cat /proc/sys/net/ipv4/ip_forward` != 0 ]; then
- action "Disabling IPv4 packet forwarding: " sysctl -w net.ipv4.ip_forward=0
+ action $"Disabling IPv4 packet forwarding: " sysctl -w net.ipv4.ip_forward=0
fi
fi
if [ -f /proc/sys/net/ipv4/ip_always_defrag ]; then
if [ `cat /proc/sys/net/ipv4/ip_always_defrag` != 0 ]; then
- action "Disabling IPv4 automatic defragmentation: " sysctl -w net.ipv4.ip_always_defrag=0
+ action $"Disabling IPv4 automatic defragmentation: " sysctl -w net.ipv4.ip_always_defrag=0
fi
fi
fi
@@ -164,34 +164,34 @@ case "$1" in
if [ -x /sbin/linuxconf ] ; then
eval `/sbin/linuxconf --hint netdev`
for device in $DEV_UP ; do
- action "Bringing up device %s: " $device ./ifup $device
+ action $"Bringing up device %s: " $device ./ifup $device
done
for device in $DEV_DOWN ; do
- action "Shutting down device %s: " $device ./ifdown $device
+ action $"Shutting down device %s: " $device ./ifdown $device
done
for device in $DEV_RECONF ; do
- action "Shutting down device %s: " $device ./ifdown $device
- action "Bringing up device %s: " $device ./ifup $device
+ action $"Shutting down device %s: " $device ./ifdown $device
+ action $"Bringing up device %s: " $device ./ifup $device
done
for device in $DEV_RECONF_ALIASES ; do
- action "Bringing up alias %s: " $device /etc/sysconfig/network-scripts/ifup-aliases $device
+ action $"Bringing up alias %s: " $device /etc/sysconfig/network-scripts/ifup-aliases $device
done
for device in $DEV_RECONF_ROUTES ; do
- action "Bringing up route %s: " $device /etc/sysconfig/network-scripts/ifup-routes $device
+ action $"Bringing up route %s: " $device /etc/sysconfig/network-scripts/ifup-routes $device
done
case $IPX in yes|true)
case $IPXINTERNALNET in
reconf)
- action "Deleting internal IPX network: " /sbin/ipx_internal_net del
- action "Adding internal IPX network %s %s: " $IPXINTERNALNETNUM $IPXINTERNALNODENUM /sbin/ipx_internal_net add $IPXINTERNALNETNUM \
+ action $"Deleting internal IPX network: " /sbin/ipx_internal_net del
+ action $"Adding internal IPX network %s %s: " $IPXINTERNALNETNUM $IPXINTERNALNODENUM /sbin/ipx_internal_net add $IPXINTERNALNETNUM \
$IPXINTERNALNODENUM
;;
add)
- action "Adding internal IPX network $IPXINTERNALNETNUM $IPXINTERNALNODENUM: "/sbin/ipx_internal_net add $IPXINTERNALNETNUM \
+ action $"Adding internal IPX network $IPXINTERNALNETNUM $IPXINTERNALNODENUM: "/sbin/ipx_internal_net add $IPXINTERNALNETNUM \
$IPXINTERNALNODENUM
;;
del)
- action "Deleting internal IPX network: " /sbin/ipx_internal_net del
+ action $"Deleting internal IPX network: " /sbin/ipx_internal_net del
;;
esac
;;
diff --git a/rc.d/init.d/random b/rc.d/init.d/random
index 363ffdf2..d5c6370a 100755
--- a/rc.d/init.d/random
+++ b/rc.d/init.d/random
@@ -23,7 +23,7 @@ case "$1" in
else
touch $random_seed
fi
- action "Initializing random number generator: " /bin/true
+ action $"Initializing random number generator: " /bin/true
chmod 600 $random_seed
dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null
touch /var/lock/subsys/random
@@ -34,7 +34,7 @@ case "$1" in
# Save 512 bytes, which is the size of the entropy pool
touch $random_seed
chmod 600 $random_seed
- action "Saving random seed: " dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null
+ action $"Saving random seed: " dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null
rm -f /var/lock/subsys/random
;;
diff --git a/rc.d/rc b/rc.d/rc
index 3194f474..bd9ff7cc 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -37,7 +37,7 @@ export CONFIRM
[ -n "$argv1" ] && runlevel="$argv1"
# Tell linuxconf what runlevel we are in
-[ -d /var/run ] && echo $"/etc/rc$runlevel.d" > /var/run/runlevel.dir
+[ -d /var/run ] && echo "/etc/rc$runlevel.d" > /var/run/runlevel.dir
# Is there an rc directory for this new runlevel?
if [ -d /etc/rc$runlevel.d ]; then
@@ -60,7 +60,7 @@ if [ -d /etc/rc$runlevel.d ]; then
if egrep -q "(killproc |action )" $i ; then
$i stop
else
- action "Stopping $subsys: " $i stop
+ action $"Stopping $subsys: " $i stop
fi
done
@@ -103,7 +103,7 @@ if [ -d /etc/rc$runlevel.d ]; then
if [ "$subsys" = "halt" -o "$subsys" = "reboot" -o "$subsys" = "single" -o "$subsys" = "local" ]; then
$i start
else
- action "Starting $subsys: " $i start
+ action $"Starting $subsys: " $i start
fi
fi
done
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 147a4277..65d3d4fe 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -50,11 +50,11 @@ fi
# Mount /proc (done here so volume labels can work with fsck)
-action "Mounting proc filesystem: " mount -n -t proc /proc /proc
+action $"Mounting proc filesystem: " mount -n -t proc /proc /proc
# Configure kernel parameters
-action "Configuring kernel parameters: " sysctl -p /etc/sysctl.conf
+action $"Configuring kernel parameters: " sysctl -p /etc/sysctl.conf
# Set the system clock.
ARC=0
@@ -101,7 +101,7 @@ esac
/sbin/hwclock $CLOCKFLAGS
-action "Setting clock $CLOCKDEF: `date`" date
+action $"Setting clock $CLOCKDEF: `date`" date
if [ "`/sbin/consoletype`" == "vt" ]; then
# Load keymap
@@ -126,7 +126,7 @@ if [ "`/sbin/consoletype`" == "vt" ]; then
echo -n $"Loading default keymap: "
fi
loadkeys $KEYMAP < /dev/tty0 > /dev/tty0 2>/dev/null && \
- success "Loading default keymap" || failure "Loading default keymap"
+ action $"Loading default keymap" || action $"Loading default keymap"
echo
fi
fi
@@ -138,40 +138,40 @@ if [ "`/sbin/consoletype`" == "vt" ]; then
-f /usr/lib/kbd/consolefonts/$SYSFONT.psf.gz -o \
-f /etc/sysconfig/console/$SYSFONT.gz -o \
-f /usr/lib/kbd/consolefonts/$SYSFONT.gz ]; then
- action "Setting default font ($SYSFONT): " /sbin/setsysfont
+ action $"Setting default font ($SYSFONT): " /sbin/setsysfont
fi
fi
fi
# Start up swapping.
-action "Activating swap partitions: " swapon -a
+action $"Activating swap partitions: " swapon -a
# Set the hostname.
-action "Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
+action $"Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
# Initialize USB controller and HID devices
usb=0
if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && ! grep -q "usb" /proc/devices 2>/dev/null ; then
alias=`/sbin/modprobe -c | egrep -s "^alias[[:space:]]+usb-controller[[:space:]]+" | awk '{ print $3 }'`
if [ -n "$alias" -a "$alias" != "off" ] ; then
- action "Initializing USB controller ($alias): " modprobe $alias
+ action $"Initializing USB controller ($alias): " modprobe $alias
[ $? -eq 0 ] && usb=1
fi
fi
if [ $usb = "1" ]; then
sleep 5
- action "Mounting USB filesystem: " mount -t usbdevfs usbdevfs /proc/bus/usb
+ action $"Mounting USB filesystem: " mount -t usbdevfs usbdevfs /proc/bus/usb
mouseoutput=`cat /proc/bus/usb/devices|grep -E "^I.*Cls=03.*Prot=02"`
kbdoutput=`cat /proc/bus/usb/devices|grep -E "^I.*Cls=03.*Prot=01"`
if [ -n "$kbdoutput" ] || [ -n "$mouseoutput" ]; then
- action "Initializing USB HID interface: " modprobe hid 2> /dev/null
+ action $"Initializing USB HID interface: " modprobe hid 2> /dev/null
fi
if [ -n "$kbdoutput" ]; then
- action "Initializing USB keyboard: " modprobe keybdev
+ action $"Initializing USB keyboard: " modprobe keybdev
fi
if [ -n "$mouseoutput" ]; then
- action "Initializing USB mouse: " modprobe mousedev
+ action $"Initializing USB mouse: " modprobe mousedev
fi
fi
@@ -198,7 +198,7 @@ else
fi
if [ -e /proc/lvm -a -x /sbin/vgchange ]; then
- action "Setting up LVM:" /sbin/vgchange -a y
+ action $"Setting up LVM:" /sbin/vgchange -a y
fi
_RUN_QUOTACHECK=0
@@ -211,16 +211,16 @@ if [ -z "$fastboot" -a "$ROOTFSTYPE" != "nfs" ]; then
rc=$?
if [ "$rc" = "0" ]; then
- success "$STRING"
+ action $"$STRING"
echo
elif [ "$rc" = "1" ]; then
- passed "$STRING"
+ action $"$STRING"
echo
fi
# A return of 2 or higher means there were serious problems.
if [ $rc -gt 1 ]; then
- failure "$STRING"
+ action $"$STRING"
echo
echo
echo $"*** An error occurred during the file system check."
@@ -251,16 +251,16 @@ fi
# set up pnp
if [ -x /sbin/isapnp -a -f /etc/isapnp.conf ]; then
if [ -n "$PNP" ]; then
- action "Setting up ISA PNP devices: " /sbin/isapnp /etc/isapnp.conf
+ action $"Setting up ISA PNP devices: " /sbin/isapnp /etc/isapnp.conf
else
- action "Skipping ISA PNP configuration at users request: " /bin/true
+ action $"Skipping ISA PNP configuration at users request: " /bin/true
fi
fi
# Remount the root filesystem read-write.
state=`awk '/(^\/dev\/root| \/ )/ { print $4 }' /proc/mounts`
[ "$state" != "rw" ] && \
- action "Remounting root filesystem in read-write mode: " mount -n -o remount,rw /
+ action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw /
# Clear mtab
>/etc/mtab
@@ -312,7 +312,7 @@ if [ -x /sbin/hdparm ]; then
hdmedia=`cat /proc/ide/${disk[$device]}/media`
if [ "$hdmedia" = "disk" ]; then
if [ -n "${HDFLAGS[$device]}" ]; then
- action "Setting hard drive parameters for ${disk[$device]}: " /sbin/hdparm ${HDFLAGS[$device]} /dev/${disk[$device]}
+ action $"Setting hard drive parameters for ${disk[$device]}: " /sbin/hdparm ${HDFLAGS[$device]} /dev/${disk[$device]}
fi
fi
fi
@@ -321,7 +321,7 @@ fi
# Update quotas if fsck was run on /.
if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then
- action "Checking root filesystem quotas: " /sbin/quotacheck -v /
+ action $"Checking root filesystem quotas: " /sbin/quotacheck -v /
fi
# The root filesystem is now read-write, so we can now log via syslog() directly..
@@ -352,9 +352,9 @@ if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then
fi
fi
if [ -L /lib/modules/default ]; then
- INITLOG_ARGS= action "Finding module dependencies: " depmod -A default
+ INITLOG_ARGS= action $"Finding module dependencies: " depmod -A default
else
- INITLOG_ARGS= action "Finding module dependencies: " depmod -A
+ INITLOG_ARGS= action $"Finding module dependencies: " depmod -A
fi
fi
@@ -363,17 +363,17 @@ if grep -q "options sound dmabuf=1" /etc/modules.conf 2>/dev/null ; then
RETURN=0
alias=`/sbin/modprobe -c | egrep -s "^alias[[:space:]]+sound[[:space:]]+" | awk '{ print $3 }'`
if [ -n "$alias" -a "$alias" != "off" ] ; then
- action "Loading sound module ($alias): " modprobe $alias
+ action $"Loading sound module ($alias): " modprobe $alias
RETURN=$?
fi
alias=`/sbin/modprobe -c | egrep -s "^alias[[:space:]]+sound-slot-0[[:space:]]+" | awk '{ print $3 }'`
if [ -n "$alias" -a "$alias" != "off" ] ; then
- action "Loading sound module ($alias): " modprobe $alias
+ action $"Loading sound module ($alias): " modprobe $alias
RETURN=$?
fi
# Load mixer settings
if grep -q "\(sparcaudio\|sound\)" /proc/devices 2>/dev/null && [ $RETURN -eq 0 -a -f /etc/.aumixrc -a -x /bin/aumix-minimal ]; then
- action "Loading mixer settings: " /bin/aumix-minimal -f /etc/.aumixrc -L
+ action $"Loading mixer settings: " /bin/aumix-minimal -f /etc/.aumixrc -L
fi
fi
@@ -456,16 +456,16 @@ if [ -z "$fastboot" ]; then
initlog -c "fsck -T -R -A -a $fsckoptions"
rc=$?
if [ "$rc" = "0" ]; then
- success "$STRING"
+ action $"$STRING"
echo
elif [ "$rc" = "1" ]; then
- passed "$STRING"
+ action $"$STRING"
echo
fi
# A return of 2 or higher means there were serious problems.
if [ $rc -gt 1 ]; then
- failure "$STRING"
+ action $"$STRING"
echo
echo
echo $"*** An error occurred during the file system check."
@@ -488,15 +488,15 @@ fi
# Mount all other filesystems (except for NFS and /proc, which is already
# mounted). Contrary to standard usage,
# filesystems are NOT unmounted in single user mode.
-action "Mounting local filesystems: " mount -a -t nonfs,smbfs,ncpfs
+action $"Mounting local filesystems: " mount -a -t nonfs,smbfs,ncpfs
if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then
- action "Checking filesystem quotas: " /sbin/quotacheck -v -R -a
+ action $"Checking filesystem quotas: " /sbin/quotacheck -v -R -a
fi
# Turn on process accounting
if [ -x /sbin/accton ] ; then
- action "Turning on process accounting" /sbin/accton /var/log/pacct
+ action $"Turning on process accounting" /sbin/accton /var/log/pacct
fi
# Configure machine if necessary.
@@ -522,14 +522,14 @@ if [ -f /.unconfigured ]; then
. /etc/sysconfig/network
# Reset the hostname.
- action "Resetting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
+ action $"Resetting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
fi
rm -f /.unconfigured
fi
if [ -x /sbin/quotaon ]; then
- action "Turning on user and group quotas for local filesystems: " /sbin/quotaon -a
+ action $"Turning on user and group quotas for local filesystems: " /sbin/quotaon -a
fi
# Clean out /etc.
@@ -570,7 +570,7 @@ rm -f /tmp/.s.PGSQL.*
# Now turn on swap in case we swap to files.
swapon -a >/dev/null 2>&1
-action "Enabling swap space: " /bin/true
+action $"Enabling swap space: " /bin/true
# Initialize the serial ports.
if [ -f /etc/rc.serial ]; then