rpms/module-init-tools/devel module-init-tools-quiet_alias_errors.patch, NONE, 1.1 module-init-tools.spec, 1.70, 1.71
Jon Masters (jcm)
fedora-extras-commits at redhat.com
Thu May 1 17:57:46 UTC 2008
Author: jcm
Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18430
Modified Files:
module-init-tools.spec
Added Files:
module-init-tools-quiet_alias_errors.patch
Log Message:
Don't be noisey on module loading errors if multiple modules match an alias.
Resolves: #442190.
module-init-tools-quiet_alias_errors.patch:
--- NEW FILE module-init-tools-quiet_alias_errors.patch ---
--- module-init-tools-3.4/modprobe.c_orig 2008-05-01 13:21:48.000000000 -0400
+++ module-init-tools-3.4/modprobe.c 2008-05-01 13:51:04.000000000 -0400
@@ -891,8 +891,13 @@ static void insmod(struct list_head *lis
newname ?: mod->modname);
goto out_unlock;
}
- error("Error inserting %s (%s): %s\n",
- mod->modname, mod->filename, insert_moderror(errno));
+ /* don't warn noisely if we're loading multiple aliases. */
+ /* one of the aliases may try to use hardware we don't have. */
+ if ((error != warn) || (verbose)) {
+ error("Error inserting %s (%s): %s\n",
+ mod->modname, mod->filename,
+ insert_moderror(errno));
+ }
}
out:
release_file(map, len);
Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- module-init-tools.spec 4 Apr 2008 15:37:58 -0000 1.70
+++ module-init-tools.spec 1 May 2008 17:57:08 -0000 1.71
@@ -1,7 +1,7 @@
Summary: Kernel module management utilities.
Name: module-init-tools
Version: 3.4
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPL
Group: System Environment/Kernel
Source: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}.tar.bz2
@@ -12,6 +12,7 @@
Patch1: module-init-tools-allconf.patch
Patch2: module-init-tools-noescape.patch
Patch3: module-init-tools-dump_modversions.patch
+Patch4: module-init-tools-quiet_alias_errors.patch
Exclusiveos: Linux
Prereq: /sbin/chkconfig sh-utils
Obsoletes: modutils-devel modutils
@@ -31,6 +32,7 @@
%patch1 -p1 -b .dist
%patch2 -p1 -b .noescape
%patch3 -p1 -b .dump
+%patch4 -p1 -b .qerrors
%build
export CFLAGS="-Os -g -DCONFIG_NO_BACKWARDS_COMPAT=1"
@@ -102,6 +104,10 @@
%ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
%changelog
+* Thu May 1 2008 Jon Masters <jcm at redhat.com> - 3.4-12
+- Quiet alias errors (prevent loud warnings on non-existent hardware).
+- Resolves: #442190.
+
* Fri Apr 4 2008 Jon Masters <jcm at redhat.com> - 3.4-11
- Add i2c-dev to modprobe.conf.dist.
- Fix a typo.
More information about the fedora-extras-commits
mailing list