summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2008-04-03 14:58:59 +0000
committerStefan Schweizer <genstef@gentoo.org>2008-04-03 14:58:59 +0000
commit929988e063d9e365d2def271cb3f4a6cdc252466 (patch)
tree0933c6da8e9eea81558e6a46478783a73ca8025e /eclass/linux-mod.eclass
parentstable ppc, bug 215861 (diff)
downloadgentoo-2-929988e063d9e365d2def271cb3f4a6cdc252466.tar.gz
gentoo-2-929988e063d9e365d2def271cb3f4a6cdc252466.tar.bz2
gentoo-2-929988e063d9e365d2def271cb3f4a6cdc252466.zip
Install modprobe.d instead of modules.d files for kernel-2.6, thanks Cardoe for helping
Diffstat (limited to 'eclass/linux-mod.eclass')
-rw-r--r--eclass/linux-mod.eclass10
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 4a7128e9b991..cfb4d8377629 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.79 2008/03/22 01:10:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.80 2008/04/03 14:58:59 genstef Exp $
# Description: This eclass is used to interface with linux-info in such a way
# to provide the functionality required and initial functions
@@ -57,7 +57,7 @@
# if the libdir isnt specified, it assumes misc.
# if the objdir isnt specified, it assumes srcdir
-# There is also support for automatyed modules.d file generation.
+# There is also support for automated modprobe.d/modules.d(2.4) file generation.
# This can be explicitly enabled by setting any of the following variables.
#
#
@@ -404,7 +404,11 @@ generate_modulesd() {
#-----------------------------------------------------------------------
# then we install it
- insinto /etc/modules.d
+ if kernel_is ge 2 6
+ insinto /etc/modprobe.d
+ else
+ insinto /etc/modules.d
+ fi
newins ${module_config} ${currm_path//*\/}
# and install any documentation we might have.