Hello community, here is the log from the commit of package module-init-tools for openSUSE:Factory checked in at 2012-09-26 16:22:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/module-init-tools (Old) and /work/SRC/openSUSE:Factory/.module-init-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "module-init-tools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/module-init-tools/module-init-tools.changes 2012-07-25 10:35:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.module-init-tools.new/module-init-tools.changes 2012-09-26 16:22:41.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 25 13:52:05 UTC 2012 - [email protected] + +- module-init-tools-fix-nfs-local.diff: do not look for config + files in /usr/local/lib/modprobe.d. This fixes a deadlock when + /usr/local is an automounted volume and the nfs.ko module is + not yet loaded (bnc#781737, bnc#744760). + +------------------------------------------------------------------- New: ---- module-init-tools-fix-nfs-local.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.IaSjci/_old 2012-09-26 16:22:42.000000000 +0200 +++ /var/tmp/diff_new_pack.IaSjci/_new 2012-09-26 16:22:42.000000000 +0200 @@ -49,6 +49,8 @@ Source7: driver-check.sh # Patch1: module-init-tools-upstream.diff Patch2: module-init-tools-suse.diff +# PATCH-FIX-UPSTREAM module-init-tools-fix-nfs-local.diff [bnc#781737] +Patch3: module-init-tools-fix-nfs-local.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,6 +73,7 @@ %setup -q -a2 # patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf --force --install ++++++ module-init-tools-fix-nfs-local.diff ++++++ Index: module-init-tools-3.15/modprobe.c =================================================================== --- module-init-tools-3.15.orig/modprobe.c +++ module-init-tools-3.15/modprobe.c @@ -1458,8 +1458,7 @@ static void parse_toplevel_config(const /* default config */ parse_config_scan(conf, dump_only, removing, "/run/modprobe.d", - "/etc/modprobe.d", "/usr/local/lib/modprobe.d", - "/lib/modprobe.d", NULL); + "/etc/modprobe.d", "/lib/modprobe.d", NULL); } /** -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
