rpms/module-init-tools/F-11 module-init-tools.spec,1.85,1.86

[Jon Masters]

Author: jcm

Update of /cvs/pkgs/rpms/module-init-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11908

Modified Files:
	module-init-tools.spec 
Log Message:
Rename /etc/modprobe.conf to /etc/modprobe.d/local.conf on upgrade (#488768)



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/F-11/module-init-tools.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- module-init-tools.spec	19 Mar 2009 19:11:35 -0000	1.85
+++ module-init-tools.spec	11 May 2009 19:53:42 -0000	1.86
@@ -2,7 +2,7 @@ Summary: Kernel module management utilit
 Name: module-init-tools
 Version: 3.7
 %define PreRelease -pre9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2
@@ -55,11 +55,21 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROO
 
 mv $RPM_BUILD_ROOT/%{_bindir}/lsmod $RPM_BUILD_ROOT/sbin
 
-touch $RPM_BUILD_ROOT/etc/modprobe.conf
+touch $RPM_BUILD_ROOT/etc/modprobe.d/local.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# We renamed all the config files upstream so they now need to end in .conf
+# and live under /etc/modprobe.d. Anaconda now uses an anaconda.conf file,
+# all of which means /etc/modprobe.conf is very legacy. Rename it to
+# /etc/modprobe.d/local.conf and allow local hacks to go in there.
+if [ -e /etc/modprobe.conf ] && [ ! -e /etc/modprobe.d/local.conf ]
+then
+	mv /etc/modprobe.conf /etc/modprobe.d/local.conf
+fi
+
 %post
 # Removed 2.4 compatibility in post-F10 (in F11 onwards).
 
@@ -69,9 +79,12 @@ rm -rf $RPM_BUILD_ROOT
 /etc/depmod.d
 /sbin/*
 %{_mandir}/*/*
-%ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.conf
+%ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
 
 %changelog
+* Mon May 11 2009 Jon Masters <jcm at redhat.com> - 3.7-8 (pre9)
+- Rename /etc/modprobe.conf to /etc/modprobe.d/local.conf on upgrade (#488768)
+
 * Thu Mar 19 2009 Jon Masters <jcm at redhat.com> - 3.7-7 (pre9)
 - Rebuild with stock vendor conf files called "dist.conf" not "fedora.conf".
 - Re-add glibc-static dependency because of zlib_flags requiring static.