[arch-projects] [initscripts] [PATCH 05/18] functions: fix indentation
Kurt J. Bosch
kjb-temp-2009 at alpenjodel.de
Mon Jun 27 13:11:11 EDT 2011
---
functions | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/functions b/functions
index 61cf3dd..dcf6887 100644
--- a/functions
+++ b/functions
@@ -285,17 +285,17 @@ kill_everything() {
# Terminate all processes
stat_busy "Sending SIGTERM To Processes"
run_hook "$1_prekillall"
- local pid k5args=""
- for pid in ${omit_pids[@]}; do
- k5args+=" -o $pid"
- done
- /sbin/killall5 -15 $k5args &>/dev/null
- /bin/sleep 5
+ local pid k5args=""
+ for pid in ${omit_pids[@]}; do
+ k5args+=" -o $pid"
+ done
+ /sbin/killall5 -15 $k5args &>/dev/null
+ /bin/sleep 5
stat_done
stat_busy "Sending SIGKILL To Processes"
- /sbin/killall5 -9 $k5args &>/dev/null
- /bin/sleep 1
+ /sbin/killall5 -9 $k5args &>/dev/null
+ /bin/sleep 1
stat_done
run_hook "$1_postkillall"
@@ -331,8 +331,8 @@ udevd_modprobe() {
activate_vgs() {
[[ $USELVM = [yY][eE][sS] && -x $(type -P lvm) && -d /sys/block ]] || return
stat_busy "Activating LVM2 groups"
- # Kernel 2.6.x, LVM2 groups
- /sbin/modprobe -q dm-mod 2>/dev/null
+ # Kernel 2.6.x, LVM2 groups
+ /sbin/modprobe -q dm-mod 2>/dev/null
if /sbin/vgchange --sysinit -a y >/dev/null; then
stat_done
else
@@ -371,14 +371,14 @@ NETFS="nonfs,nonfs4,nosmbfs,nocifs,nocodafs,noncpfs,nosysfs,noshfs,nofuse,nofuse
# Check local filesystems
fsck_all() {
stat_busy "Checking Filesystems"
- FSCK_OUT=/dev/stdout
- FSCK_ERR=/dev/stdout
- FSCK_FD=
- FORCEFSCK=
- [[ -f /forcefsck ]] || in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-- -f"
- run_hook sysinit_prefsck
- fsck -A -T -C$FSCK_FD -a -t "$NETFS,noopts=_netdev" $FORCEFSCK >$FSCK_OUT 2>$FSCK_ERR
- local fsckret=$?
+ FSCK_OUT=/dev/stdout
+ FSCK_ERR=/dev/stdout
+ FSCK_FD=
+ FORCEFSCK=
+ [[ -f /forcefsck ]] || in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-- -f"
+ run_hook sysinit_prefsck
+ fsck -A -T -C$FSCK_FD -a -t "$NETFS,noopts=_netdev" $FORCEFSCK >$FSCK_OUT 2>$FSCK_ERR
+ local fsckret=$?
if (( fsckret > 1 )); then
stat_fail
else
@@ -426,9 +426,9 @@ fsck_reboot() {
mount_all() {
stat_busy "Mounting Local Filesystems"
- run_hook sysinit_premount
- mount -a -t $NETFS -O no_netdev
- run_hook sysinit_postmount
+ run_hook sysinit_premount
+ mount -a -t $NETFS -O no_netdev
+ run_hook sysinit_postmount
stat_done
}
@@ -502,13 +502,13 @@ fi
set_consolefont() {
[[ $CONSOLEFONT ]] || return 0
stat_busy "Loading Console Font: $CONSOLEFONT"
- #CONSOLEMAP in UTF-8 shouldn't be used
- [[ $CONSOLEMAP && ${LOCALE,,} =~ utf ]] && CONSOLEMAP=""
- local i
- for i in /dev/tty[0-9]*; do
- /usr/bin/setfont ${CONSOLEMAP:+-m ${CONSOLEMAP}} \
- $CONSOLEFONT -C ${i} &>/dev/null
- done
+ #CONSOLEMAP in UTF-8 shouldn't be used
+ [[ $CONSOLEMAP && ${LOCALE,,} =~ utf ]] && CONSOLEMAP=""
+ local i
+ for i in /dev/tty[0-9]*; do
+ /usr/bin/setfont ${CONSOLEMAP:+-m ${CONSOLEMAP}} \
+ $CONSOLEFONT -C ${i} &>/dev/null
+ done
if (( $? )); then
stat_fail
elif [[ $CONSOLEMAP ]]; then
--
1.7.1
More information about the arch-projects
mailing list