Hello community, here is the log from the commit of package module-init-tools checked in at Tue May 16 17:10:44 CEST 2006. -------- --- module-init-tools/module-init-tools.changes 2006-05-02 13:42:59.000000000 +0200 +++ module-init-tools/module-init-tools.changes 2006-05-16 15:52:20.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 15 13:15:40 CEST 2006 - mjancar@suse.cz + +- fix priority of cmdline vs config options (#162253) + +------------------------------------------------------------------- New: ---- module-init-tools-3.2.2-options-priority.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.WBecRz/_old 2006-05-16 17:10:22.000000000 +0200 +++ /var/tmp/diff_new_pack.WBecRz/_new 2006-05-16 17:10:22.000000000 +0200 @@ -13,7 +13,7 @@ Name: module-init-tools BuildRequires: dietlibc dietzlib docbook-utils xmlcharent Version: 3.2.2 -Release: 30 +Release: 32 %define ver 3.2.2 License: GPL Group: System/Kernel @@ -41,6 +41,7 @@ Patch12: %{name}-%{ver}-skip-unsupported.diff Patch13: %{name}-%{ver}-fmt.diff Patch14: %{name}-%{ver}-regex.diff +Patch15: %{name}-%{ver}-options-priority.diff Exclusiveos: Linux BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,13 +71,13 @@ %patch4 %patch5 %patch6 -#%patch8 %patch10 %patch11 %patch12 %patch13 %patch8 %patch14 +%patch15 %build %{suse_update_config -f} @@ -146,6 +147,8 @@ /etc/modprobe.d %changelog -n module-init-tools +* Mon May 15 2006 - mjancar@suse.cz +- fix priority of cmdline vs config options (#162253) * Tue May 02 2006 - mjancar@suse.cz - fix infinite loop when supported module requested by alias depends on unsupported module (#170675) ++++++ module-init-tools-3.2.2-options-priority.diff ++++++ --- modprobe.c +++ modprobe.c @@ -808,6 +808,19 @@ return options; } +static char *prepend_option(char *oldoptions, const char *newoption) +{ + char *options; + + if (strlen(oldoptions)) + return oldoptions; + + options = NOFAIL(malloc(strlen(oldoptions) + 1 + strlen(newoption) + 1)); + snprintf(options, "%s %s", newoption, oldoptions); + free(oldoptions); + return options; +} + /* Add to options */ static char *add_extra_options(const char *modname, char *optstring, @@ -815,7 +828,7 @@ { while (options) { if (strcmp(options->modulename, modname) == 0) - optstring = append_option(optstring, options->options); + optstring = prepend_option(optstring, options->options); options = options->next; } return optstring; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...