summaryrefslogtreecommitdiff
path: root/init.d
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-01-17 04:49:07 -0500
committerMike Frysinger <vapier@gentoo.org>2011-01-17 04:49:12 -0500
commitfaa2df11597cf496205d3d629e3b3147b569afc8 (patch)
tree6e1db42c42365087686f48dbe9c39515de03f4ab /init.d
parent711713d6642eff155bfede8a2dd213824016b76c (diff)
downloadopenrc-faa2df11597cf496205d3d629e3b3147b569afc8.tar.gz
openrc-faa2df11597cf496205d3d629e3b3147b569afc8.tar.bz2
openrc-faa2df11597cf496205d3d629e3b3147b569afc8.tar.xz
more whitespace cleanup
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'init.d')
-rw-r--r--init.d/adjkerntz.in4
-rw-r--r--init.d/bootmisc.in4
-rw-r--r--init.d/hostid.in2
-rw-r--r--init.d/hwclock.in8
-rw-r--r--init.d/ipfw.in14
-rw-r--r--init.d/keymaps.in2
-rw-r--r--init.d/killprocs.in2
-rw-r--r--init.d/moused.in10
-rw-r--r--init.d/net.lo.in22
-rw-r--r--init.d/netmount.in2
-rw-r--r--init.d/network.in4
-rw-r--r--init.d/pf.in2
-rw-r--r--init.d/swap-blk.in4
-rw-r--r--init.d/swap.in4
-rw-r--r--init.d/syscons.in6
-rw-r--r--init.d/ttys.in4
-rw-r--r--init.d/wscons.in4
17 files changed, 49 insertions, 49 deletions
diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in
index ee09ac8..807d411 100644
--- a/init.d/adjkerntz.in
+++ b/init.d/adjkerntz.in
@@ -4,7 +4,7 @@
extra_commands="save"
-description="Sets the local clock to UTC or Local Time."
+description="Sets the local clock to UTC or Local Time."
description_save="Saves the current time in the BIOS."
: ${clock:=${CLOCK:-UTC}}
@@ -26,7 +26,7 @@ depend()
}
start()
-{
+{
ebegin "Starting the System Clock Adjuster [${utc}]"
if [ "$clock" != "UTC" ]; then
echo >/etc/wall_cmos_clock
diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 1298740..320e7e8 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -88,7 +88,7 @@ start()
eend 1 "failed to create needed directory $x"
return 1
fi
- fi
+ fi
done
if dir_writeable /var/run; then
@@ -137,7 +137,7 @@ start()
# Make sure our X11 stuff have the correct permissions
# Omit the chown as bootmisc is run before network is up
# and users may be using lame LDAP auth #139411
- rm -rf /tmp/.ICE-unix /tmp/.X11-unix
+ rm -rf /tmp/.ICE-unix /tmp/.X11-unix
mkdir -p /tmp/.ICE-unix /tmp/.X11-unix
chmod 1777 /tmp/.ICE-unix /tmp/.X11-unix
if [ -x /sbin/restorecon ]; then
diff --git a/init.d/hostid.in b/init.d/hostid.in
index 26ea9d6..a12e34a 100644
--- a/init.d/hostid.in
+++ b/init.d/hostid.in
@@ -68,7 +68,7 @@ reset()
start()
{
if [ -r "$hostid_file" ]; then
- _set $(cat "$hostid_file")
+ _set $(cat "$hostid_file")
else
reset
fi
diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index e99900f..7ab630c 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -4,7 +4,7 @@
extra_commands="save show"
-description="Sets the local clock to UTC or Local Time."
+description="Sets the local clock to UTC or Local Time."
description_save="Saves the current time in the BIOS."
description_show="Displays the current time in the BIOS."
@@ -87,7 +87,7 @@ start()
_hwclock --adjust $utc_cmd
retval=$(($retval + $?))
fi
-
+
# If setting UTC, don't bother to run hwclock when first booting
# as that's the default
if [ "$PREVLEVEL" != N -o \
@@ -97,7 +97,7 @@ start()
_hwclock --hctosys $utc_cmd $clock_args
retval=$(($retval + $?))
fi
-
+
eend $retval "Failed to set the system clock"
return 0
@@ -126,7 +126,7 @@ stop()
_hwclock --systohc $utc_cmd $clock_args
retval=$?
- eend $retval "Failed to sync clocks"
+ eend $retval "Failed to sync clocks"
}
save()
diff --git a/init.d/ipfw.in b/init.d/ipfw.in
index 9d6faa4..ea6e22a 100644
--- a/init.d/ipfw.in
+++ b/init.d/ipfw.in
@@ -40,11 +40,11 @@ init() {
ipfw add deny all from any to 127.0.0.0/8
ipfw add deny ip from 127.0.0.0/8 to any
- if have_ip6; then
+ if have_ip6; then
ipfw add pass ip6 from any to any via lo0
ipfw add deny ip6 from any to ::1
ipfw add deny ip6 from ::1 to any
-
+
ipfw add pass ip6 from :: to ff02::/16 proto ipv6-icmp
ipfw add pass ip6 from fe80::/10 to fe80::/10 proto ipv6-icmp
ipfw add pass ip6 from fe80::/10 to ff02::/16 proto ipv6-icmp
@@ -78,7 +78,7 @@ start() {
ipfw add pass udp from 0.0.0.0 68 to 255.255.255.255 67 out
ipfw add pass udp from any 67 to me 68 in
ipfw add pass udp from any 67 to 255.255.255.255 68 in
- # Some servers will ping the IP while trying to decide if it's
+ # Some servers will ping the IP while trying to decide if it's
# still in use.
ipfw add pass icmp from any to any icmptype 8
@@ -88,11 +88,11 @@ start() {
if have_ip6; then
# Allow ICMPv6 destination unreach
ipfw add pass ip6 from any to any icmp6types 1 proto ipv6-icmp
-
+
# Allow NS/NA/toobig (don't filter it out)
ipfw add pass ip6 from any to any icmp6types 2,135,136 proto ipv6-icmp
fi
-
+
# Add permits for this workstations published services below
# Only IPs and nets in firewall_allowservices is allowed in.
for i in $ipfw_ip_in; do
@@ -107,7 +107,7 @@ start() {
for i in $ipfw_ip_trust; do
ipfw add pass ip from $i to me
done
-
+
ipfw add 65000 count ip from any to any
# Drop packets to ports where we don't want logging
@@ -117,7 +117,7 @@ start() {
# Broadcasts and muticasts
ipfw add deny ip from any to 255.255.255.255
- ipfw add deny ip from any to 224.0.0.0/24
+ ipfw add deny ip from any to 224.0.0.0/24
# Noise from routers
ipfw add deny udp from any to any 520 in
diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index f37fbb5..776f3bb 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -17,7 +17,7 @@ start()
: ${unicode:=$UNICODE}
: ${keymap:=$KEYMAP}
: ${extended_keymaps:=$EXTENDED_KEYMAPS}
- : ${windowkeys:=$SET_WINDOWSKEYS}
+ : ${windowkeys:=$SET_WINDOWSKEYS}
: ${fix_euro:=$FIX_EURO}
: ${dumpkeys_charset:=${DUMPKEYS_CHARSET}}
diff --git a/init.d/killprocs.in b/init.d/killprocs.in
index d12f0f6..7132e9e 100644
--- a/init.d/killprocs.in
+++ b/init.d/killprocs.in
@@ -15,7 +15,7 @@ start()
killall5 -15
sleep 1
eend 0
- ebegin "Killing remaining processes"
+ ebegin "Killing remaining processes"
killall5 -9
sleep 1
eend 0
diff --git a/init.d/moused.in b/init.d/moused.in
index a362228..33b8d02 100644
--- a/init.d/moused.in
+++ b/init.d/moused.in
@@ -21,13 +21,13 @@ depend()
start()
{
- ebegin "Starting $name"
+ ebegin "Starting $name"
if [ -z "$moused_device" ]; then
local dev=
for dev in /dev/psm[0-9]* /dev/ums[0-9]*; do
[ -c "$dev" ] || continue
- [ -e /var/run/moused-"${dev##*/}".pid ] && continue
+ [ -e /var/run/moused-"${dev##*/}".pid ] && continue
moused_device=$dev
eindent
einfo "Using mouse on $moused_device"
@@ -37,7 +37,7 @@ start()
fi
if [ -z "$moused_device" ]; then
- eend 1 "No mouse device found"
+ eend 1 "No mouse device found"
return 1
fi
@@ -49,7 +49,7 @@ start()
--pidfile "$pidfile" \
-- $args -p "$moused_device" -I "$pidfile"
local retval=$?
-
+
if [ $retval = 0 ]; then
local ttyv=
for ttyv in /dev/ttyv*; do
@@ -57,6 +57,6 @@ start()
: $((retval+= $?))
done
fi
-
+
eend $retval "Failed to start moused"
}
diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 30d0186..b194a23 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -180,7 +180,7 @@ _gen_module_list()
${update} || return 0
fi
- einfo "Caching network module dependencies"
+ einfo "Caching network module dependencies"
# Run in a subshell to protect the main script
(
after() {
@@ -215,7 +215,7 @@ _gen_module_list()
for MODULE in "${MODULESDIR}"/*.sh; do
sh -n "${MODULE}" || continue
- . "${MODULE}" || continue
+ . "${MODULE}" || continue
MODULE=${MODULE#${MODULESDIR}/}
MODULE=${MODULE%.sh}
eval ${MODULE}_depend
@@ -343,7 +343,7 @@ _load_modules()
# Wrap our provides
local f=
- for f in pre_start start post_start; do
+ for f in pre_start start post_start; do
eval "${provides}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@\"; }"
done
@@ -357,7 +357,7 @@ _load_modules()
*" ${mod} "*)
eval x=\$module_${mod}_provides
[ -z "${x}" ] && continue
- for f in pre_start start post_start; do
+ for f in pre_start start post_start; do
eval "${x}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@\"; }"
done
eval module_${x}_providedby="${mod}"
@@ -379,7 +379,7 @@ _load_modules()
MODULES="${MODULES}${MODULES:+ }${mod}"
done
else
- for mod in ${LIST}; do
+ for mod in ${LIST}; do
MODULES="${mod}${MODULES:+ }${MODULES}"
done
fi
@@ -395,7 +395,7 @@ _load_config()
config_index=0
local IFS="$__IFS"
set -- ${config}
-
+
# We should support a space separated array for cidr configs
if [ $# = 1 ]; then
unset IFS
@@ -415,7 +415,7 @@ _load_config()
config_0="127.0.0.1/8"
config_index=1
fi
- else
+ else
if [ -z "$1" ]; then
ewarn "No configuration specified; defaulting to DHCP"
config_0="dhcp"
@@ -500,7 +500,7 @@ start()
fi
_up 2>/dev/null
-
+
for module in ${MODULES}; do
if [ "$(command -v "${module}_pre_start")" = "${module}_pre_start" ]; then
${module}_pre_start || exit $?
@@ -527,7 +527,7 @@ start()
_load_config
config_index=0
- eval our_metric=\$metric_${IFVAR}
+ eval our_metric=\$metric_${IFVAR}
if [ -n "${our_metric}" ]; then
metric=${our_metric}
elif [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
@@ -536,7 +536,7 @@ start()
while true; do
eval config=\$config_${config_index}
- [ -z "${config}" ] && break
+ [ -z "${config}" ] && break
set -- ${config}
ebegin "$1"
@@ -638,7 +638,7 @@ ${routes}"
if [ "$(command -v postup)" = "postup" ]; then
ebegin "Running postup"
eindent
- postup
+ postup
eoutdent
fi
diff --git a/init.d/netmount.in b/init.d/netmount.in
index 88ce16f..3bdc63b 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -39,7 +39,7 @@ depend()
}
start()
-{
+{
local myneed= myuse= pmap="portmap" nfsmounts=
[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
diff --git a/init.d/network.in b/init.d/network.in
index 01e88ce..a563332 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -222,7 +222,7 @@ start()
einfo "Starting network"
routeflush
if [ "$RC_UNAME" = "Linux" ]; then
- ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1
+ ifconfig lo 127.0.0.1 netmask 255.0.0.0 || cr=1
route add -net 127.0.0.0 netmask 255.0.0.0 \
gw 127.0.0.1 reject 2>/dev/null
else
@@ -287,7 +287,7 @@ start()
[ $r != 0 ]
veend $?
fi
-
+
if [ -n "$defaultroute" ]; then
ebegin "Setting default route $defaultroute"
route add default $defaultroute
diff --git a/init.d/pf.in b/init.d/pf.in
index 15c9fc5..a36df26 100644
--- a/init.d/pf.in
+++ b/init.d/pf.in
@@ -44,7 +44,7 @@ reload()
{
ebegin "Reloading $name rules."
pfctl -q -n -f "$pf_conf" && \
- {
+ {
# Flush everything but existing state entries that way when
# rules are read in, it doesn't break established connections.
pfctl -q -Fnat -Fqueue -Frules -FSources -Finfo -FTables -Fosfp
diff --git a/init.d/swap-blk.in b/init.d/swap-blk.in
index 3c1c52c..f7d4367 100644
--- a/init.d/swap-blk.in
+++ b/init.d/swap-blk.in
@@ -13,11 +13,11 @@ start()
ebegin "Activating block swap devices"
swapctl -A -t blk >/dev/null
eend 0 # If swapon has nothing todo it errors, so always return 0
-}
+}
stop()
{
ebegin "Deactivating block swap devices"
swapctl -U -t blk >/dev/null
- eend 0
+ eend 0
}
diff --git a/init.d/swap.in b/init.d/swap.in
index d99b9b8..a1a931f 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -16,7 +16,7 @@ start()
*) swapon -a >/dev/null;;
esac
eend 0 # If swapon has nothing todo it errors, so always return 0
-}
+}
stop()
{
@@ -31,5 +31,5 @@ stop()
NetBSD|OpenBSD) swapctl -U -t noblk >/dev/null;;
*) swapoff -a >/dev/null;;
esac
- eend 0
+ eend 0
}
diff --git a/init.d/syscons.in b/init.d/syscons.in
index cb584b3..ba22bf5 100644
--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -15,13 +15,13 @@ start() {
done
eend $?
fi
-
+
if [ -n "$keymap" ]; then
ebegin "Setting keymap to $keymap"
kbdcontrol -l $keymap </dev/console
eend $?
fi
-
+
if [ -n "$keyrate" ]; then
ebegin "Setting keyrate to $keyrate"
kbdcontrol -r $keyrate </dev/console
@@ -40,7 +40,7 @@ start() {
done
eoutdent
fi
-
+
if [ -n "$cursor" ]; then
ebegin "Setting cursor"
vidcontrol -c $cursor
diff --git a/init.d/ttys.in b/init.d/ttys.in
index 178f182..b8a051d 100644
--- a/init.d/ttys.in
+++ b/init.d/ttys.in
@@ -2,7 +2,7 @@
# Copyright (c) 2008 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license.
-depend()
+depend()
{
after fsck
keyword -prefix
@@ -13,7 +13,7 @@ start()
ebegin "Setting tty flags"
ttyflags -a
eend $? || return $?
-
+
if [ -c /dev/ttyp0 ]; then
chmod 666 /dev/tty[p-uw-zP-T][0-9a-zA-Z]
fi
diff --git a/init.d/wscons.in b/init.d/wscons.in
index 3b18a24..916e27b 100644
--- a/init.d/wscons.in
+++ b/init.d/wscons.in
@@ -27,10 +27,10 @@ start()
font)
cmd=$wsfld
[ "$arg2" != "-" ] && cmd="$cmd -w $arg2"
- [ "$arg3" != "-" ] && cmd="$cmd -h $arg3"
+ [ "$arg3" != "-" ] && cmd="$cmd -h $arg3"
[ "$arg4" != "-" ] && cmd="$cmd -e $arg4"
cmd="$cmd -N $arg1 $arg5"
- eval "$cmd"
+ eval "$cmd"
;;
screen)