rpms/module-init-tools/devel module-init-tools-allconf.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 module-init-tools.spec, 1.10, 1.11 sources, 1.4, 1.5 module-init-tools-defconfig.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7290

Modified Files:
	.cvsignore module-init-tools.spec sources 
Added Files:
	module-init-tools-allconf.patch 
Removed Files:
	module-init-tools-defconfig.patch 
Log Message:
update to 3.2pre7
modprobe wouldn't read /etc/modprobe.d if /etc/modprobe.conf existed. Fix that.
put modprobe.conf.dist in /etc/modprobe.d, instead of our current hack.


module-init-tools-allconf.patch:
 modprobe.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE module-init-tools-allconf.patch ---
--- module-init-tools-3.2-pre7/modprobe.c.dist	2005-06-01 07:26:28.000000000 -0400
+++ module-init-tools-3.2-pre7/modprobe.c	2005-07-08 15:30:55.000000000 -0400
@@ -1189,8 +1189,8 @@
 
 static const char *default_configs[] = 
 {
-	"/etc/modprobe.conf",
 	"/etc/modprobe.d",
+	"/etc/modprobe.conf",
 };
 
 static void read_toplevel_config(const char *filename,
@@ -1214,9 +1214,8 @@
 
 	/* Try defaults. */
 	for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
-		if (read_config(default_configs[i], name, dump_only, removing,
-				options, commands, aliases, blacklist))
-			return;
+		read_config(default_configs[i], name, dump_only, removing,
+			    options, commands, aliases, blacklist);
 	}
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Mar 2005 23:37:32 -0000	1.4
+++ .cvsignore	8 Jul 2005 19:46:05 -0000	1.5
@@ -1,2 +1,4 @@
 module-init-tools-3.1.tar.bz2
 module-init-tools-3.1.tar.bz2.sign
+module-init-tools-3.2-pre7.tar.bz2
+module-init-tools-3.2-pre7.tar.bz2.sign


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- module-init-tools.spec	25 Apr 2005 16:42:24 -0000	1.10
+++ module-init-tools.spec	8 Jul 2005 19:46:06 -0000	1.11
@@ -1,13 +1,14 @@
+%define preversion pre7
 Summary: Kernel module management utilities.
 Name: module-init-tools
-Version: 3.1
-Release: 3
+Version: 3.2
+Release: 0.%{preversion}.1
 License: GPL
 Group: System Environment/Kernel
-Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2
-Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2.sign
+Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2
+Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2.sign
 Source2: modprobe.conf.dist
-Patch1: module-init-tools-defconfig.patch
+Patch1: module-init-tools-allconf.patch
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modules modutils-devel modutils
@@ -22,7 +23,7 @@
 are two examples of loaded and unloaded modules.
 
 %prep
-%setup -q -n module-init-tools-%{version}
+%setup -q -n module-init-tools-%{version}-%{preversion}
 %patch1 -p1 -b .dist
 
 %build
@@ -47,8 +48,12 @@
 install -m 755 generate-modprobe.conf \
  $RPM_BUILD_ROOT/sbin
 
+install -m 644 modprobe.d.5 \
+ $RPM_BUILD_ROOT/%{_mandir}/man5
+
 mkdir -p $RPM_BUILD_ROOT/etc
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.conf.dist
+mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/modprobe.conf.dist
 
 find $RPM_BUILD_ROOT/sbin/ -name '*.static' -exec rm {} \;
 
@@ -76,11 +81,15 @@
 
 %files
 %defattr(-,root,root)
-/etc/modprobe.conf.dist
+/etc/modprobe.d
 /sbin/*
 %{_mandir}/*/*
 
 %changelog
+* Fri Jul  8 2005 Bill Nottingham <notting at redhat.com> 3.2-0.pre7.1
+- update to 3.2-pre7
+- put modprobe.conf.dist in /etc/modprobe.d
+
 * Mon Apr 25 2005 Bill Nottingham <notting at redhat.com> 3.1-3
 - load snd-seq-device/snd-seq-oss on load of pcm devices (part of #147637)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Mar 2005 23:37:32 -0000	1.4
+++ sources	8 Jul 2005 19:46:06 -0000	1.5
@@ -1,2 +1,2 @@
-8ddecbcf0e56aef8617f67a3906faf3e  module-init-tools-3.1.tar.bz2
-d352d8f0d981baae7990efc2f8659494  module-init-tools-3.1.tar.bz2.sign
+90eec11f7afa255a7202432fa0d8a39d  module-init-tools-3.2-pre7.tar.bz2
+75446f67bedfe2cc45333e6a53d0d67f  module-init-tools-3.2-pre7.tar.bz2.sign


--- module-init-tools-defconfig.patch DELETED ---