summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2011-04-17 09:12:20 -0400
committerAnthony G. Basile <blueness@gentoo.org>2011-04-17 09:12:20 -0400
commitac56ab7f6df616a7a40878b59f647b8042108def (patch)
tree262a9f814edf525659602083c7b7cf869a7eda6c
parentad8f455726c5d66cea191b652053440118b89705 (diff)
downloadopenrc-ac56ab7f6df616a7a40878b59f647b8042108def.tar.gz
openrc-ac56ab7f6df616a7a40878b59f647b8042108def.tar.bz2
openrc-ac56ab7f6df616a7a40878b59f647b8042108def.tar.xz
Check for /sys/module/usbcore before modprobe usbcore
The use of /proc/bus/usb to mount usbfs has been deprecated, but the option is still available in the kernel. The new approach is to use /sys. We should not modprobe usbcore if either /proc/bus/usb or /sys/module/usbcore exist. X-Gentoo-Bug: 363551 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=363551 Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--init.d/procfs.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/init.d/procfs.in b/init.d/procfs.in
index c5331b8..049fade 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -14,7 +14,7 @@ depend()
start()
{
# Make sure we insert usbcore if it's a module
- if [ -f /proc/modules -a ! -d /proc/bus/usb ]; then
+ if [ -f /proc/modules -a ! -d /sys/module/usbcore -a ! -d /proc/bus/usb ]; then
modprobe -q usbcore
fi