Hello community, here is the log from the commit of package module-init-tools checked in at Wed Dec 13 01:21:49 CET 2006. -------- --- module-init-tools/module-init-tools.changes 2006-11-06 15:52:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/module-init-tools/module-init-tools.changes 2006-12-12 21:12:33.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 21:12:13 CET 2006 - mmarek@suse.cz + +- fixed options-priority.diff [#226907] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.zcOTgE/_old 2006-12-13 01:17:17.000000000 +0100 +++ /var/tmp/diff_new_pack.zcOTgE/_new 2006-12-13 01:17:17.000000000 +0100 @@ -13,9 +13,9 @@ Name: module-init-tools BuildRequires: dietlibc dietzlib Version: 3.2.2 -Release: 56 +Release: 63 %define ver 3.2.2 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/Kernel Provides: modules modutils Obsoletes: modules modutils @@ -59,10 +59,8 @@ Authors: -------- - Bjorn Ekwall <bj0rn@blox.se> - Jon Tombs <jon@gtex02.us.es> - Bas Laarhoven <bas@vimec.nl> - Keith Owens <kaos@ocs.com.au> + Rusty Russell <rusty@rustcorp.com.au> + Adam J. Richter <adam@yggdrasil.com> %prep %setup -q -a10 -n %{name}-%{ver} @@ -152,6 +150,8 @@ /etc/modprobe.d %changelog -n module-init-tools +* Tue Dec 12 2006 - mmarek@suse.cz +- fixed options-priority.diff [#226907] * Mon Nov 06 2006 - nadvornik@suse.cz - do not remove weak-update symlinks on package update [#216454] * Fri Nov 03 2006 - olh@suse.de ++++++ module-init-tools-3.2.2-options-priority.diff ++++++ --- /var/tmp/diff_new_pack.zcOTgE/_old 2006-12-13 01:17:17.000000000 +0100 +++ /var/tmp/diff_new_pack.zcOTgE/_new 2006-12-13 01:17:17.000000000 +0100 @@ -1,26 +1,27 @@ --- modprobe.c +++ modprobe.c -@@ -808,6 +808,19 @@ +@@ -808,6 +808,20 @@ static char *append_option(char *options return options; } -+static char *prepend_option(char *oldoptions, const char *newoption) ++static char *prepend_option(char *options, const char *newoption) +{ -+ char *options; -+ -+ if (strlen(oldoptions)) -+ return oldoptions; -+ -+ options = NOFAIL(malloc(strlen(oldoptions) + 1 + strlen(newoption) + 1)); -+ sprintf(options, "%s %s", newoption, oldoptions); -+ free(oldoptions); ++ size_t l1, l2; ++ l1 = strlen(options); ++ l2 = strlen(newoption); ++ /* the resulting string will look like ++ * newoption + ' ' + options + '\0' */ ++ options = NOFAIL(realloc(options, l2 + 1 + l1 + 1)); ++ memmove(options + l2 + 1, options, l1 + 1); ++ options[l2] = ' '; ++ memcpy(options, newoption, l2); + return options; +} + /* Add to options */ static char *add_extra_options(const char *modname, char *optstring, -@@ -815,7 +828,7 @@ +@@ -815,7 +829,7 @@ static char *add_extra_options(const cha { while (options) { if (strcmp(options->modulename, modname) == 0) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org