diff options
Diffstat (limited to 'init.d.Linux')
| -rwxr-xr-x | init.d.Linux/consolefont | 4 | ||||
| -rwxr-xr-x | init.d.Linux/keymaps | 2 | ||||
| -rwxr-xr-x | init.d.Linux/modules | 26 | ||||
| -rw-r--r-- | init.d.Linux/procfs | 10 | ||||
| -rw-r--r-- | init.d.Linux/sysctl | 2 |
5 files changed, 14 insertions, 30 deletions
diff --git a/init.d.Linux/consolefont b/init.d.Linux/consolefont index c1a4755a..824a848e 100755 --- a/init.d.Linux/consolefont +++ b/init.d.Linux/consolefont @@ -56,7 +56,7 @@ start() { return 0 fi - local x= param= sf_param= retval=1 ttydev= + local x= param= sf_param= retval=0 ttydev= # Get additional parameters if [ -n "${consoletranslation}" ]; then @@ -74,7 +74,7 @@ start() { x=1 while [ ${x} -le ${ttyn} ]; do - setfont ${consolefont} ${param}-C ${ttydev}${x} >/dev/null + setfont ${consolefont} ${param} -C ${ttydev}${x} >/dev/null retval=$((${retval} + $?)) x=$((${x} + 1)) done diff --git a/init.d.Linux/keymaps b/init.d.Linux/keymaps index 014024b5..4af63838 100755 --- a/init.d.Linux/keymaps +++ b/init.d.Linux/keymaps @@ -103,4 +103,4 @@ start() { eend 0 } -# vim:ts=4 +# vim: set ts=4 : diff --git a/init.d.Linux/modules b/init.d.Linux/modules index 4c21fdb5..75fa8f6b 100755 --- a/init.d.Linux/modules +++ b/init.d.Linux/modules @@ -1,5 +1,4 @@ #!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation # Copyright 2007 Roy Marples # All rights reserved @@ -35,7 +34,7 @@ load_modules() { local modules="" local config="$1" - [ -z "${config}" -o ! -r "${config}" ] && return 0 + [ -r "${config}" ] || return 0 eval set -- $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' \ -e "s/'/'\\\\''/g" -e "s/^/'/g" -e "s/$/'/g" "${config}") @@ -69,23 +68,7 @@ start() { x=${KV#*.*.} local KV_MICRO=${x%%-*} - # Make sure depmod from modutils do not whine, but do not bother if - # we are on a 2.6 kernel without modprobe.old - if [ -z "${CDBOOT}" -a ! -e /etc/modules.conf ] && \ - [ $(KV_to_int "${KV}") -lt $(KV_to_int '2.5.48') -o -x /sbin/modprobe.old ] - then - echo '### This file is automatically generated by update-modules' \ - > /etc/modules.conf 2>/dev/null - [ ! -f /etc/modules.conf ] && \ - ewarn "Cannot update /etc/modules.conf!" - fi - - # Only do this if we have modules.conf or a 2.6 kernel - if [ -z "${CDBOOT}" ] && \ - [ -f /etc/modules.conf -o $(KV_to_int "${KV}") -ge $(KV_to_int '2.5.48') ] - then - /sbin/update-modules - fi + [ -z "${CDBOOT}" ] && update-modules local auto="" if [ -f /etc/modules.autoload -a ! -L /etc/modules.autoload ]; then @@ -109,15 +92,12 @@ start() { fi [ -n "${auto}" ] && load_modules "${auto}" - # # Just in case a sysadmin prefers generic symbolic links in # /lib/modules/boot for boot time modules we will load these modules - # [ -n "$(modprobe -l -t boot)" ] && modprobe -a -t boot \* 2>/dev/null # Above test clobbers the return return 0 } - -# vim:ts=4 +# vim: set ts=4 : diff --git a/init.d.Linux/procfs b/init.d.Linux/procfs index 85de863b..06a4e78a 100644 --- a/init.d.Linux/procfs +++ b/init.d.Linux/procfs @@ -78,8 +78,8 @@ start() { 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 + mount -t securityfs -o nodev,noexec,nosuid \ + securityfs /sys/kernel/security eend $? fi fi @@ -88,8 +88,8 @@ start() { 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 + mount -t debugfs -o nodev,noexec,nosuid \ + debugfs /sys/kernel/debug eend $? fi fi @@ -105,3 +105,5 @@ start() { return 0 } + +# vim: set ts=4 : diff --git a/init.d.Linux/sysctl b/init.d.Linux/sysctl index 2cac1019..b1971cab 100644 --- a/init.d.Linux/sysctl +++ b/init.d.Linux/sysctl @@ -35,3 +35,5 @@ start() { sysctl -p /etc/sysctl.conf >/dev/null eend $? } + +# vim: set ts=4 : |