diff options
| author | Roy Marples <roy@marples.name> | 2007-12-14 20:09:53 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-12-14 20:09:53 +0000 |
| commit | afdcf1fa158e9833c163068f77e88d21ba0e3225 (patch) | |
| tree | c170f21fb6be2dc278e2554c4ae7595f1738d1a4 /init.d.Linux/modules | |
| parent | 584cea1f8e0d2aa21f75c273159608d9ee35cda5 (diff) | |
| download | openrc-afdcf1fa158e9833c163068f77e88d21ba0e3225.tar.gz openrc-afdcf1fa158e9833c163068f77e88d21ba0e3225.tar.bz2 openrc-afdcf1fa158e9833c163068f77e88d21ba0e3225.tar.xz | |
udev requires try function and the modules-update program should take care of any 2.4 vs 2.6 kernel issues. Also add vim instructions to a few files.
Diffstat (limited to 'init.d.Linux/modules')
| -rwxr-xr-x | init.d.Linux/modules | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/init.d.Linux/modules b/init.d.Linux/modules index 4c21fdb..75fa8f6 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 : |