X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installmodules;h=6799a122bb1e6d13396176764ad6cf81c099e289;hb=9c484fa4be79b09214a573fdfc8a7ab25d7c7ab1;hp=2d1d596945de519f02213bc553a48764438c8e70;hpb=9df3c2d67cf20d04adda19eed55d70d866c51b16;p=debhelper.git

diff --git a/dh_installmodules b/dh_installmodules
index 2d1d596..6799a12 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -20,21 +20,26 @@ B<dh_installmodules> [S<I<debhelper options>>] [B<-n>] [B<--name=>I<name>]
 dh_installmodules is a debhelper program that is responsible for
 registering kernel modules.
 
-Files named debian/package.modprobe will be installed in
-etc/modprobe.d/package in the package build directory, to be used by
-module-init-tools's version of modprobe.
-
 Kernel modules are searched for in the package build directory and if
 found, postinst and postrm commands are automatically generated to 
 run depmod and register the modules when the package is installed. 
-These commands are inserted into the maintainer scripts by dh_installdeb.
-See L<dh_installdeb(1)> for an explanation of how this works.
+These commands are inserted into the maintainer scripts by
+L<dh_installdeb(1)>.
+
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.modprobe
 
-Previous versions of dh_installmodules also supported 
-files named debian/package.modules, which were installed into 
-etc/modutils/package in the package build directory. This was for use by
-modutils, which is no longer in Debian. dh_installmodules will warn about
-such files now.
+Installed to etc/modprobe.d/I<package>.conf in the package build directory.
+
+=item debian/I<package>.modules
+
+These files were installed for use by modutils, but are now not used
+and dh_installmodules will warn if these files are present.
+
+=back
 
 =head1 OPTIONS
 
@@ -47,15 +52,14 @@ Do not modify postinst/postrm scripts.
 =item B<--name=>I<name>
 
 When this parameter is used, dh_installmodules looks for and
-installs files named debian/package.name.modules and
-debian/package.name.modprobe instead of the usual
-debian/package.modules and debian/package.modprobe
+installs files named debian/I<package>.I<name>.modprobe instead
+of the usual debian/I<package>.modprobe
 
 =back
 
 =head1 NOTES
 
-Note that this command is not idempotent. "dh_clean -k" should be called
+Note that this command is not idempotent. L<dh_prep(1)> should be called
 between invocations of this command. Otherwise, it may cause multiple
 instances of the same text to be added to maintainer scripts.
 
@@ -102,7 +106,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		if (! -e "$tmp/etc/modprobe.d") {
 			doit("install","-d","$tmp/etc/modprobe.d");
 		}
-		doit("install","-m","0644",$modprobe_file,"$tmp/etc/modprobe.d/".pkgfilename($package));
+		my $old="/etc/modprobe.d/".pkgfilename($package);
+		my $new=$old.".conf";
+		doit("install","-m","0644",$modprobe_file,"$tmp/$new");
+		autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#PACKAGE#!$package!g");
+		autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$new!g");
 	}
 	
 	if (! $dh{NOSCRIPTS}) {