docs/support files: remove deprecated/obsolete back-compat stuff

  FAQ
    - removed references to modprobe.conf, as it should not be
      needed in that context
    - used /etc/modprobe.d/sound.conf for the alsa example (perhaps
      this can go away completely now; I think alsa handles this
      automatically if needed)
    - trivial typo fix
  Makefile.am
    - removed references to modprobe.devfs (obsolete)
  NEWS
    - noted release of 3.7 and 3.8, but Jon will need to clarify
      their status with respect to maintenance and such
    - noted the deprecation of generate-modprobe.conf and the
      fact that it is no longer installed by default
  README
    - clarified note about backwards compatibility (requires a
      2.6.x kernel, and no support at all for older modutils)
    - updated instructions to remove note about generate-modprobe.conf
  modprobe.defvs
    - removed completely from the repo; this is obsolete now

5 files changed, 18 insertions, 89 deletions

diff --git a/FAQ b/FAQ
index 304af9a..7c675d0 100644
--- a/FAQ
+++ b/FAQ
@@ -13,17 +13,12 @@ A) Old versions of RedHat turns module autoloading off if /proc/ksyms
 
   if ! grep -iq nomodules /proc/cmdline 2>/dev/null && [ -f /proc/modules ]; then
 
-Q) Things still don't load properly.
-A) Do you have an /etc/modprobe.conf?  If not, use
-   generate-modprobe.conf to generate an /etc/modprobe.conf from your
-   old setup.
-
 Q) Sound doesn't load automatically.
 A) You need to set up an alias (or install command) for "sound-slot-0" in
-   /etc/modprobe.conf: the ALSA sound system seems to want this.
+   /etc/modprobe.d/sound.conf: the ALSA sound system sometimes wants this.
 
 Q) What is "[unsafe]" next to the module name in lsmod?
-A) It means somone used an old-style interfaces to try to control this
+A) It means someone used an old-style interfaces to try to control this
    module: these are slowly being tracked down and eliminated.  You can
    use "rmmod -f" to force removal if you configured your kernel with
    CONFIG_MODULE_FORCE_UNLOAD set.
diff --git a/Makefile.am b/Makefile.am
index e5bb4c7..424aa8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,11 +45,10 @@ mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then
 
 TESTSUITE := $(shell test -e @srcdir@/tests && find @srcdir@/tests -type f ! -name '*~')
 
-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
+EXTRA_DIST = generate-modprobe.conf FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
 
 sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
 bin_PROGRAMS = lsmod
-sbin_SCRIPTS = generate-modprobe.conf
 noinst_PROGRAMS=modindex
 noinst_LIBRARIES = libmodtools.a
 INSTALL = $(SHELL) $(top_srcdir)/install-with-care
diff --git a/NEWS b/NEWS
index dc6f247..cfa89b1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,14 @@
 NEWS for module-init-tools
 --------------------------
 
+generate-modules.conf is now deprecated, as the old modutils is no longer
+  supported at all.  As such, this file is no longer installed by default
+  (it will have to be manually installed if you need it), and all packages
+  should be migrated away from needing it as soon as possible.
+
 * New mailing list: linux-modules@vger.kernel.org
-* Release 3.7 is pending at the moment.
+* Release 3.8 was ??
+* Release 3.7 was ??
 * Release 3.6 was a regular maintenance release.
 * Release 3.5 included a lot of cleanups, new module indexing
 
diff --git a/README b/README
index 2c35e4f..d947700 100644
--- a/README
+++ b/README
@@ -1,31 +1,22 @@
 PLEASE READ INSTRUCTIONS CAREFULLY.
-THIS WILL DESTROY THE OLD MODUTILS FOR PRE-2.6 KERNELS!
-THERE IS NO BACKWARDS COMPATABILITY.
+THERE IS NO BACKWARDS COMPATABILITY FOR PRE-2.6 KERNELS!
 
-1) If running for the first time, you might try to convert your old
-   modules.conf to modprobe.conf automatically:
-
-	./generate-modprobe.conf /etc/modprobe.conf
-
-2a) If you want to install in /sbin:
+1a) If you want to install in /sbin:
 	./configure --prefix= --mandir=/usr/share/man
 
-2b) If you want to install in /usr/local/sbin:
+1b) If you want to install in /usr/local/sbin:
 	./configure
 
-3) Now, build it:
+2) Now, build it:
 	make
 	make install
 
-4) If you are using devfs, copy modprobe.devfs to /etc
-
-5) You will need to run "depmod" for your new kernel, eg:
-
-	depmod 2.5.50
+3) You will need to run "depmod" for your new kernel, eg:
+	depmod 2.6.29
 
 6) If you want to hack on the source:
 	autoreconf -i
 	(or in full: aclocal -I m4 && automake --add-missing --copy && autoconf)
 
-If this is all too complicated, I recommend getting and installing the
-source rpm or debian package instead.
+If this is all too complicated, I recommend getting and installing your
+distribution package or source rpm instead.
diff --git a/modprobe.devfs b/modprobe.devfs
deleted file mode 100644
index f99d433..0000000
--- a/modprobe.devfs
+++ /dev/null
@@ -1,62 +0,0 @@
-# /etc/modprobe.devfs:
-
-alias /dev/discs/* /dev/discs
-alias /dev/cdroms/* /dev/cdroms
-alias /dev/cdrom /dev/cdroms
-alias /dev/tapes/* /dev/tapes
-alias /dev/ide/*/cd ide-cd
-alias /dev/sd* /dev/sd
-alias /dev/sr* /dev/sr
-alias /dev/scsi/*/cd sr_mod
-alias /dev/st* /dev/st
-alias /dev/nst* /dev/st
-alias /dev/sg* /dev/sg
-alias /dev/scsi/*/generic /dev/sg
-alias /dev/pg /dev/sg
-alias /dev/pg* /dev/sg
-alias /dev/floppy floppy
-alias /dev/fd* floppy
-alias /dev/rd rd
-alias /dev/ram* rd
-alias /dev/loop* loop
-alias /dev/md* gen-md
-alias /dev/printers* lp
-alias /dev/lp* /dev/printers
-alias /dev/sound sound-slot-0
-alias /dev/audio sound-slot-0
-alias /dev/mixer sound-slot-0
-alias /dev/dsp sound-slot-0
-alias /dev/dspW sound-slot-0
-alias /dev/midi sound-slot-0
-alias /dev/js* /dev/joysticks
-alias /dev/tts* serial
-alias /dev/ttyS* /dev/tts
-alias /dev/cua* /dev/tts
-alias /dev/input/mouse* mousedev
-alias /dev/apm_bios apm
-alias /dev/misc/apm_bios apm
-alias /dev/misc/atibm atixlmouse
-alias /dev/misc/inportbm msbusmouse
-alias /dev/misc/logibm busmouse
-alias /dev/misc/rtc rtc
-alias /dev/misc/agpgart agpgart
-alias /dev/rtc rtc
-alias /dev/ppp* ppp_generic
-alias /dev/video* /dev/v4l
-alias /dev/vbi* /dev/v4l
-alias /dev/agpgart agpgart
-alias /dev/dri* agpgart
-alias /dev/ircomm ircomm-tty
-alias /dev/ircomm* ircomm-tty
-alias /dev/rawctl /dev/raw
-install /dev/cdroms /sbin/modprobe scsi_hostadapter; /sbin/modprobe sr_mod; /sbin/modprobe ide-probe-mod; /sbin/modprobe ide-cd; /sbin/modprobe cdrom; /bin/true
-install /dev/discs /sbin/modprobe scsi_hostadapter; /sbin/modprobe sd_mod; /sbin/modprobe ide-probe-mod; /sbin/modprobe ide-disk; /sbin/modprobe ide-floppy; /sbin/modprobe DAC960; /bin/true
-install /dev/ide /sbin/modprobe ide-probe-mod; /sbin/modprobe ide-disk; /sbin/modprobe ide-cd; /sbin/modprobe ide-tape; /sbin/modprobe ide-floppy; /bin/true
-install /dev/scsi /sbin/modprobe scsi_hostadapter; /sbin/modprobe sd_mod; /sbin/modprobe sr_mod; /sbin/modprobe st; /sbin/modprobe sg; /bin/true
-install /dev/sd /sbin/modprobe scsi_hostadapter; /sbin/modprobe sd_mod; /bin/true
-install /dev/sg /sbin/modprobe scsi_hostadapter; /sbin/modprobe sg; /bin/true
-install /dev/sr /sbin/modprobe scsi_hostadapter; /sbin/modprobe sr_mod; /bin/true
-install /dev/st /sbin/modprobe scsi_hostadapter; /sbin/modprobe st; /bin/true
-install /dev/tapes /sbin/modprobe scsi_hostadapter; /sbin/modprobe st; /sbin/modprobe ide-probe-mod; /sbin/modprobe ide-tape; /bin/true
-
-include /etc/modprobe.conf