diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-03-30 13:37:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 16:03:15 -0700 |
| commit | 970e2486492aa1eb47a436a5a4c81e92558986a9 (patch) | |
| tree | 5c321b58b536695b513f21b9b8d5431f0db88ac5 /Documentation/aoe | |
| parent | 096015236df46c64be8b86e41fd4e28522e5f7e5 (diff) | |
| download | linux-970e2486492aa1eb47a436a5a4c81e92558986a9.tar.gz linux-970e2486492aa1eb47a436a5a4c81e92558986a9.tar.bz2 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')
| -rw-r--r-- | Documentation/aoe/aoe.txt | 2 | ||||
| -rw-r--r-- | Documentation/aoe/autoload.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/aoe/aoe.txt b/Documentation/aoe/aoe.txt index b5aada9f20cc..5f5aa16047ff 100644 --- a/Documentation/aoe/aoe.txt +++ b/Documentation/aoe/aoe.txt @@ -35,7 +35,7 @@ CREATING DEVICE NODES sh Documentation/aoe/mkshelf.sh /dev/etherd 0 There is also an autoload script that shows how to edit - /etc/modprobe.conf to ensure that the aoe module is loaded when + /etc/modprobe.d/aoe.conf to ensure that the aoe module is loaded when necessary. USING DEVICE NODES 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 |