aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-09-12 20:54:47 +0000
committerBill Nottingham <notting@redhat.com>2005-09-12 20:54:47 +0000
commit530c2b024fd7e686210cf2f4e20a97ccc3421413 (patch)
tree3e246412b6020fcc05f6f979a622325f13d72994 /rc.d
parent4823dc5eea9be7800b30ed54e20d6729f1299603 (diff)
downloadinitscripts-530c2b024fd7e686210cf2f4e20a97ccc3421413.tar
initscripts-530c2b024fd7e686210cf2f4e20a97ccc3421413.tar.gz
initscripts-530c2b024fd7e686210cf2f4e20a97ccc3421413.tar.bz2
initscripts-530c2b024fd7e686210cf2f4e20a97ccc3421413.tar.xz
initscripts-530c2b024fd7e686210cf2f4e20a97ccc3421413.zip
fix usage of the blacklist (#168020)
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/rc.sysinit7
1 files changed, 6 insertions, 1 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 29db361c..0883fb4b 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -146,8 +146,13 @@ eval `kmodule -d | while read devtype mod ; do
esac
done`
+blacklist=$(modprobe -c | LC_ALL=C awk '/^[[:space:]]*blacklist/ { print $2 }')
+
load_module () {
- LC_ALL=C fgrep -xq "$1" /etc/hotplug/blacklist 2>/dev/null || modprobe $1 >/dev/null 2>&1
+ for module in $blacklist ; do
+ [ "$1" = "$module" ] && return
+ done
+ modprobe $1 >/dev/null 2>&1
}
# IDE