summaryrefslogtreecommitdiffstats
path: root/Documentation/aoe/autoload.sh
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-03-30 22:37:16 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-31 01:03:15 +0200
commit970e2486492aa1eb47a436a5a4c81e92558986a9 (patch)
tree5c321b58b536695b513f21b9b8d5431f0db88ac5 /Documentation/aoe/autoload.sh
parentDocumentation: input.txt: clarify mousedev 'cat' command syntax (diff)
downloadlinux-970e2486492aa1eb47a436a5a4c81e92558986a9.tar.xz
linux-970e2486492aa1eb47a436a5a4c81e92558986a9.zip
Documentation: remove references to /etc/modprobe.conf
Usage of /etc/modprobe.conf file was deprecated by module-init-tools and is no longer parsed by new kmod tool. References to this file are replaced in Documentation, comments and Kconfig according to the context. There are also some references to the old /etc/modules.conf from 2.4 kernels that are being removed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> Acked-by: Takashi Iwai <tiwai@suse.de> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/aoe/autoload.sh')
-rw-r--r--Documentation/aoe/autoload.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/aoe/autoload.sh b/Documentation/aoe/autoload.sh
index 78dad1334c6f..815dff4691c9 100644
--- a/Documentation/aoe/autoload.sh
+++ b/Documentation/aoe/autoload.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# set aoe to autoload by installing the
-# aliases in /etc/modprobe.conf
+# aliases in /etc/modprobe.d/
-f=/etc/modprobe.conf
+f=/etc/modprobe.d/aoe.conf
if test ! -r $f || test ! -w $f; then
echo "cannot configure $f for module autoloading" 1>&2