Massive whitespace cleanup
This commit is contained in:
@@ -54,9 +54,9 @@ setupopts() {
|
||||
TBLURB="s390"
|
||||
;;
|
||||
*)
|
||||
if [ -e /proc/devices ] && grep -q " cobd$" /proc/devices ; then
|
||||
if [ -e /proc/devices ] && grep -q " cobd$" /proc/devices; then
|
||||
TBLURB="coLinux"
|
||||
elif [ "${CLOCK}" = "UTC" ] ; then
|
||||
elif [ "${CLOCK}" = "UTC" ]; then
|
||||
utc="--utc"
|
||||
TBLURB="UTC"
|
||||
else
|
||||
@@ -77,7 +77,7 @@ start() {
|
||||
|
||||
ebegin "Setting system clock using the hardware clock [${TBLURB}]"
|
||||
if [ -n "${utc}" ]; then
|
||||
if [ -e /proc/modules -a ! -e /dev/rtc ] ; then
|
||||
if [ -e /proc/modules -a ! -e /dev/rtc ]; then
|
||||
modprobe -q rtc || modprobe -q genrtc
|
||||
fi
|
||||
|
||||
@@ -120,7 +120,7 @@ stop() {
|
||||
fi
|
||||
errstr="$(LC_ALL=C hwclock --systohc ${utc} ${clock_args} 2>&1 >/dev/null)"
|
||||
fi
|
||||
if [ -n "${errstr}" ] ; then
|
||||
if [ -n "${errstr}" ]; then
|
||||
ewarn "${errstr}"
|
||||
retval=1
|
||||
fi
|
||||
|
||||
@@ -70,7 +70,7 @@ start() {
|
||||
# Set the console font
|
||||
local errmsg=
|
||||
ebegin "Setting user font"
|
||||
if [ -x /bin/setfont ] ; then
|
||||
if [ -x /bin/setfont ]; then
|
||||
# We patched setfont to have --tty support ...
|
||||
if [ -n "$(setfont --help 2>&1 | grep -e '--tty')" ] || \
|
||||
[ -n "$(setfont --help 2>&1 | grep -e '-C')" ]
|
||||
@@ -110,7 +110,7 @@ start() {
|
||||
for font in /usr/share/consolefonts/"${consolefont}".*; do :; done
|
||||
cp "${font}" "${RC_LIBDIR}"/console
|
||||
echo "$(basename "${font}")" > "${RC_LIBDIR}"/console/font
|
||||
if yesno ${unicode:-${UNICODE}} ; then
|
||||
if yesno ${unicode:-${UNICODE}}; then
|
||||
printf "" > "${RC_LIBDIR}"/console/unicode
|
||||
else
|
||||
rm -f "${RC_LIBDIR}"/console/unicode
|
||||
|
||||
@@ -47,7 +47,7 @@ start() {
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -z "${keymap}" ] ; then
|
||||
if [ -z "${keymap}" ]; then
|
||||
eerror "You need to setup keymap in /etc/conf.d/keymaps first"
|
||||
return 1
|
||||
fi
|
||||
@@ -59,7 +59,7 @@ start() {
|
||||
|| ttydev=/dev/tty
|
||||
|
||||
# Force linux keycodes for PPC.
|
||||
if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ] ; then
|
||||
if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ]; then
|
||||
echo 1 > /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes
|
||||
fi
|
||||
|
||||
@@ -74,7 +74,7 @@ start() {
|
||||
fi
|
||||
|
||||
ebegin "Loading key mappings"
|
||||
if [ -x /bin/loadkeys ] ; then
|
||||
if [ -x /bin/loadkeys ]; then
|
||||
yesno ${windowskeys} && wkeys="windowkeys"
|
||||
loadkeys -q ${loadkeys_uni} ${wkeys} ${keymap} ${extended_keymaps}
|
||||
eend $? "Error loading key mappings"
|
||||
|
||||
@@ -45,7 +45,7 @@ load_modules() {
|
||||
eindent
|
||||
|
||||
local x= cnt=0
|
||||
for x in "$@" ; do
|
||||
for x in "$@"; do
|
||||
set -- ${x}
|
||||
ebegin "Loading module $1"
|
||||
eval modprobe -q "$@"
|
||||
@@ -92,16 +92,16 @@ start() {
|
||||
auto=/etc/modules.autoload
|
||||
else
|
||||
local x= f="/etc/modules.autoload.d/kernel"
|
||||
for x in "${KV}" ${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} ${KV_MAJOR}.${KV_MINOR} ; do
|
||||
if [ -f "${f}-${x}.${RC_SOFTLEVEL}" ] ; then
|
||||
for x in "${KV}" ${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} ${KV_MAJOR}.${KV_MINOR}; do
|
||||
if [ -f "${f}-${x}.${RC_SOFTLEVEL}" ]; then
|
||||
auto="${f}-${x}.${RC_SOFTLEVEL}"
|
||||
break
|
||||
fi
|
||||
if [ "${RC_SOFTLEVEL}" = "${RC_BOOTLEVEL}" -a -f "${f}-${x}.${RC_DEFAULTLEVEL}" ] ; then
|
||||
if [ "${RC_SOFTLEVEL}" = "${RC_BOOTLEVEL}" -a -f "${f}-${x}.${RC_DEFAULTLEVEL}" ]; then
|
||||
auto="${f}-${x}.${RC_DEFAULTLEVEL}"
|
||||
break
|
||||
fi
|
||||
if [ -f "${f}-${x}" ] ; then
|
||||
if [ -f "${f}-${x}" ]; then
|
||||
auto="${f}-${x}"
|
||||
break
|
||||
fi
|
||||
|
||||
@@ -38,7 +38,7 @@ _setleds() {
|
||||
local dev=/dev/tty t= i=1 retval=0
|
||||
[ -d /dev/vc ] && dev=/dev/vc/
|
||||
|
||||
while [ ${i} -le ${ttyn} ] ; do
|
||||
while [ ${i} -le ${ttyn} ]; do
|
||||
setleds -D "$1"num < ${dev}${i} || retval=1
|
||||
i=$((${i} + 1))
|
||||
done
|
||||
|
||||
@@ -44,7 +44,7 @@ start() {
|
||||
if [ -d /proc/bus/usb -a ! -e /proc/bus/usb/devices ]; then
|
||||
local usbfs=$(grep -Fow usbfs /proc/filesystems ||
|
||||
grep -Fow usbdevfs /proc/filesystems)
|
||||
if [ -n "${usbfs}" ] ; then
|
||||
if [ -n "${usbfs}" ]; then
|
||||
ebegin "Mounting USB device filesystem (${usbfs})"
|
||||
local usbgid="$(getent group usb | \
|
||||
sed -e 's/.*:.*:\(.*\):.*/\1/')"
|
||||
@@ -56,8 +56,8 @@ start() {
|
||||
fi
|
||||
|
||||
# Setup Kernel Support for the NFS daemon status
|
||||
if [ -d /proc/fs/nfsd ] && ! mountinfo -q /proc/fs/nfsd ; then
|
||||
if grep -qs nfsd /proc/filesystems ; then
|
||||
if [ -d /proc/fs/nfsd ] && ! mountinfo -q /proc/fs/nfsd; then
|
||||
if grep -qs nfsd /proc/filesystems; then
|
||||
ebegin "Mounting nfsd filesystem"
|
||||
mount -t nfsd -o nodev,noexec,nosuid \
|
||||
nfsd /proc/fs/nfsd
|
||||
@@ -66,8 +66,8 @@ start() {
|
||||
fi
|
||||
|
||||
# Setup Kernel Support for miscellaneous Binary Formats
|
||||
if [ -d /proc/sys/fs/binfmt_misc ] && ! mountinfo -q /proc/sys/fs/binfmt_misc ; then
|
||||
if grep -qs binfmt_misc /proc/filesystems ; then
|
||||
if [ -d /proc/sys/fs/binfmt_misc ] && ! mountinfo -q /proc/sys/fs/binfmt_misc; then
|
||||
if grep -qs binfmt_misc /proc/filesystems; then
|
||||
ebegin "Mounting misc binary format filesystem"
|
||||
mount -t binfmt_misc -o nodev,noexec,nosuid \
|
||||
binfmt_misc /proc/sys/fs/binfmt_misc
|
||||
@@ -76,8 +76,8 @@ start() {
|
||||
fi
|
||||
|
||||
# Setup Kernel Support for securityfs
|
||||
if [ -d /sys/kernel/security ] && ! mountinfo -q /sys/kernel/security ; then
|
||||
if grep -qs securityfs /proc/filesystems ; then
|
||||
if [ -d /sys/kernel/security ] && ! mountinfo -q /sys/kernel/security; then
|
||||
if grep -qs securityfs /proc/filesystems; then
|
||||
ebegin "Mounting security filesystem"
|
||||
mount -t securityfs securityfs /sys/kernel/security \
|
||||
-o nodev,noexec,nosuid
|
||||
@@ -86,8 +86,8 @@ start() {
|
||||
fi
|
||||
|
||||
# Setup Kernel Support for debugfs
|
||||
if [ -d /sys/kernel/debug ] && ! mountinfo -q /sys/kernel/debug ; then
|
||||
if grep -qs debugfs /proc/filesystems ; then
|
||||
if [ -d /sys/kernel/debug ] && ! mountinfo -q /sys/kernel/debug; then
|
||||
if grep -qs debugfs /proc/filesystems; then
|
||||
ebegin "Mounting debug filesystem"
|
||||
mount -t debugfs debugfs /sys/kernel/debug \
|
||||
-o nodev,noexec,nosuid
|
||||
@@ -96,8 +96,8 @@ start() {
|
||||
fi
|
||||
|
||||
# Setup Kernel Support for SELinux
|
||||
if [ -d /selinux ] && ! mountinfo -q /selinux ; then
|
||||
if grep -qs selinuxfs /proc/filesystems ; then
|
||||
if [ -d /selinux ] && ! mountinfo -q /selinux; then
|
||||
if grep -qs selinuxfs /proc/filesystems; then
|
||||
ebegin "Mounting SELinux filesystem"
|
||||
mount -t selinuxfs selinuxfs /selinux
|
||||
eend $?
|
||||
|
||||
Reference in New Issue
Block a user