diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2010-09-05 05:58:02 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2010-09-05 05:58:02 (GMT) |
| commit | 6bcdc0236ae6c23bc9dd057913716af393af71ea (patch) | |
| tree | a4cef43716cfa2040b11ae2ffb5867cd4a7ef6e7 /abs/core-testing/udev/load-modules.sh | |
| parent | 099ccac45c11ee6f96198367e9bea7040c9358c8 (diff) | |
| download | linhes_pkgbuild-6bcdc0236ae6c23bc9dd057913716af393af71ea.zip linhes_pkgbuild-6bcdc0236ae6c23bc9dd057913716af393af71ea.tar.gz linhes_pkgbuild-6bcdc0236ae6c23bc9dd057913716af393af71ea.tar.bz2 | |
udev:Bumped/Updated for LinHES 7.
Diffstat (limited to 'abs/core-testing/udev/load-modules.sh')
| -rwxr-xr-x | abs/core-testing/udev/load-modules.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/abs/core-testing/udev/load-modules.sh b/abs/core-testing/udev/load-modules.sh index a42d376..1e2af91 100755 --- a/abs/core-testing/udev/load-modules.sh +++ b/abs/core-testing/udev/load-modules.sh @@ -9,7 +9,7 @@ BLACKLIST="${MOD_BLACKLIST[@]}" MODPROBE="/sbin/modprobe" LOGGER="/usr/bin/logger" -RESOLVEALIAS="/bin/resolve-modalias" +RESOLVEALIAS="${MODPROBE} --resolve-alias" USEBLACKLIST="--use-blacklist" if [ -f /proc/cmdline ]; then @@ -42,11 +42,11 @@ if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then #sanitize the blacklist BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')" # Try to find all modules for the alias - mods=$($RESOLVEALIAS /lib/modules/$(uname -r)/modules.alias $1) + mods=$($RESOLVEALIAS $1) # If no modules could be found, try if the alias name is a module name # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST="" - [ -z "${mods}" ] && $LOGGER -p info -t "$(basename $0)" "'$1' is not a valid module or alias name" + [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name" for mod in ${mods}; do # Find the module and all its dependencies deps="$($MODPROBE -i --show-depends ${mod})" @@ -61,9 +61,9 @@ if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then for dep in $deps; do if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then if [ "${dep}" = "${mod}" ]; then - $LOGGER -p info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted" + $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted" else - $LOGGER -p info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted" + $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted" fi continue 2 fi @@ -74,7 +74,7 @@ if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then $MODPROBE $USEBLACKLIST ${mod} done else - $MODPROBE $1 + $MODPROBE $USEBLACKLIST $1 fi fi # vim: set et ts=4: |