packages: module-init-tools/module-init-tools-modprobe_d.patch, module-init...

[arekm]

Author: arekm                        Date: Mon Aug 15 16:29:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix using /etc/modprobe.d/kver dir

---- Files affected:
packages/module-init-tools:
   module-init-tools-modprobe_d.patch (1.10 -> 1.11) , module-init-tools.spec (1.89 -> 1.90) 

---- Diffs:

================================================================
Index: packages/module-init-tools/module-init-tools-modprobe_d.patch
diff -u packages/module-init-tools/module-init-tools-modprobe_d.patch:1.10 packages/module-init-tools/module-init-tools-modprobe_d.patch:1.11
--- packages/module-init-tools/module-init-tools-modprobe_d.patch:1.10	Tue May 31 15:51:51 2011
+++ packages/module-init-tools/module-init-tools-modprobe_d.patch	Mon Aug 15 18:29:42 2011
@@ -1,6 +1,6 @@
---- module-init-tools-3.12/modprobe.c.orig	2010-05-04 07:19:27.000000000 +0200
-+++ module-init-tools-3.12/modprobe.c	2010-08-15 09:15:37.990822457 +0200
-@@ -82,6 +82,8 @@
+--- module-init-tools-3.16/modprobe.c.org	2011-08-15 18:27:47.961488079 +0200
++++ module-init-tools-3.16/modprobe.c	2011-08-15 18:28:35.239355945 +0200
+@@ -86,6 +86,8 @@
  
  } modprobe_flags_t;
  
@@ -9,8 +9,7 @@
  #ifndef MODULE_DIR
  #define MODULE_DIR "/lib/modules"
  #endif
-@@ -1065,20 +1067,28 @@
- 	 		/* sort files from directory into list, ignoring duplicates */
+@@ -1333,19 +1335,27 @@
  			while ((i = readdir(dir)) != NULL) {
  				size_t len;
  				int cmp = -1;
@@ -40,18 +39,16 @@
  				fe = malloc(sizeof(struct file_entry));
  				if (fe == NULL)
  					continue;
-@@ -1129,6 +1139,10 @@
- 		warn("Deprecated config file /etc/modprobe.conf, "
- 		      "all config files belong into /etc/modprobe.d/.\n");
- 
-+	/* kernel ver based config */
-+	if ( modprobe_d_ver != NULL )
-+			parse_config_scan(modprobe_d_ver, conf, dump_only, removing);
-+
+@@ -1428,7 +1438,7 @@
  	/* default config */
- 	parse_config_scan("/etc/modprobe.d", conf, dump_only, removing);
+ 	parse_config_scan(conf, dump_only, removing, "/run/modprobe.d",
+ 			  "/etc/modprobe.d", "/usr/local/lib/modprobe.d",
+-			  "/lib/modprobe.d", NULL);
++			  "/lib/modprobe.d", modprobe_d_ver, NULL);
  }
-@@ -1815,6 +1829,7 @@
+ 
+ /**
+@@ -2234,6 +2244,7 @@
  		print_usage(argv[0]);
  
  	nofail_asprintf(&dirname, "%s%s/%s", basedir, MODULE_DIR, buf.release);

================================================================
Index: packages/module-init-tools/module-init-tools.spec
diff -u packages/module-init-tools/module-init-tools.spec:1.89 packages/module-init-tools/module-init-tools.spec:1.90
--- packages/module-init-tools/module-init-tools.spec:1.89	Sat Jun 11 20:15:22 2011
+++ packages/module-init-tools/module-init-tools.spec	Mon Aug 15 18:29:42 2011
@@ -17,7 +17,7 @@
 Summary(uk.UTF-8):	Утиліти для роботи з модулями ядра
 Name:		module-init-tools
 Version:	3.16
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://kernel.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2
@@ -186,6 +186,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90  2011/08/15 16:29:42  arekm
+- rel 2; fix using /etc/modprobe.d/kver dir
+
 Revision 1.89  2011/06/11 18:15:22  qboosh
 - fixed max patch to use proper number
 - updated sparc patch (special .div etc. symbols mangling is still used)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools-modprobe_d.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools.spec?r1=1.89&r2=1.90&f=u