rpms/module-init-tools/devel module-init-tools-allconf.patch, 1.3, 1.4 module-init-tools.spec, 1.49, 1.50

[fedora-cvs-commits at redhat.com]

Author: jcm

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

Modified Files:
	module-init-tools-allconf.patch module-init-tools.spec 
Log Message:
allconf respun again


module-init-tools-allconf.patch:
 depmod.c   |    3 +--
 modprobe.c |    5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

Index: module-init-tools-allconf.patch
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools-allconf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- module-init-tools-allconf.patch	12 Oct 2006 06:07:17 -0000	1.3
+++ module-init-tools-allconf.patch	12 Oct 2006 06:21:05 -0000	1.4
@@ -1,51 +1,28 @@
-diff -urN module-init-tools-3.3-pre3_orig/depmod.c module-init-tools-3.3-pre3/depmod.c
---- module-init-tools-3.3-pre3_orig/depmod.c	2006-10-12 07:03:31.000000000 +0100
-+++ module-init-tools-3.3-pre3/depmod.c	2006-10-12 06:17:41.000000000 +0100
-@@ -1021,8 +1021,8 @@
- 
- static const char *default_configs[] =
- {
--	"/etc/depmod.d",
- 	"/etc/depmod.conf",
-+	"/etc/depmod.d",
- };
- 
- static void read_toplevel_config(const char *filename,
-@@ -1041,7 +1041,8 @@
+diff -urN module-init-tools-3.3-pre3/depmod.c module-init-tools-3.3-pre3_new/depmod.c
+--- module-init-tools-3.3-pre3/depmod.c	2006-10-12 06:17:41.000000000 +0100
++++ module-init-tools-3.3-pre3_new/depmod.c	2006-10-12 07:14:51.000000000 +0100
+@@ -1041,8 +1041,7 @@
  
  	/* Try defaults. */
  	for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
--		read_config(default_configs[i], basedir, search, overrides);
-+		if (read_config(default_configs[i], basedir, search, overrides))
-+			return;
+-		if (read_config(default_configs[i], basedir, search, overrides))
+-			return;
++		read_config(default_configs[i], basedir, search, overrides);
  	}
  }
  
-diff -urN module-init-tools-3.3-pre3_orig/modprobe.c module-init-tools-3.3-pre3/modprobe.c
---- module-init-tools-3.3-pre3_orig/modprobe.c	2006-10-12 07:00:37.000000000 +0100
-+++ module-init-tools-3.3-pre3/modprobe.c	2006-09-30 02:12:39.000000000 +0100
-@@ -1225,8 +1225,8 @@
- 
- static const char *default_configs[] = 
- {
--	"/etc/modprobe.d",
- 	"/etc/modprobe.conf",
-+	"/etc/modprobe.d",
- };
- 
- static void read_toplevel_config(const char *filename,
-@@ -1249,9 +1249,11 @@
- 	}
+diff -urN module-init-tools-3.3-pre3/modprobe.c module-init-tools-3.3-pre3_new/modprobe.c
+--- module-init-tools-3.3-pre3/modprobe.c	2006-09-30 02:12:39.000000000 +0100
++++ module-init-tools-3.3-pre3_new/modprobe.c	2006-10-12 07:15:42.000000000 +0100
+@@ -1250,9 +1250,8 @@
  
  	/* Try defaults. */
--	for (i = 0; i < ARRAY_SIZE(default_configs); i++)
--		read_config(default_configs[i], name, dump_only, removing,
--			    options, commands, aliases, blacklist);
-+	for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
-+		if (read_config(default_configs[i], name, dump_only, removing,
-+				options, commands, aliases, blacklist))
-+			return;
-+	}
+ 	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);
+ 	}
  }
  
- static void add_to_env_var(const char *option)


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- module-init-tools.spec	12 Oct 2006 06:07:17 -0000	1.49
+++ module-init-tools.spec	12 Oct 2006 06:21:05 -0000	1.50
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre3.1.2
+Release: 0.pre3.1.3
 License: GPL
 Group: System Environment/Kernel
 Source: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -104,7 +104,7 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
-* Thu Oct 12 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre3.1.0
+* Thu Oct 12 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre3.1.3
 - Updated to upstream with some miscellaneous fixes from contrib.
 - Rebuilt allconf patch since retabbed upstream source.