Hello community, here is the log from the commit of package linuxrc checked in at Wed Mar 12 19:52:32 CET 2008. -------- --- linuxrc/linuxrc.changes 2008-02-27 11:33:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2008-03-12 16:20:08.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 12 16:20:06 CET 2008 - snwint@suse.de + +- yep is now smt +- Tejun: allow module options to be passed simply as 'module.option' + +------------------------------------------------------------------- Old: ---- linuxrc-3.1.8.tar.bz2 New: ---- linuxrc-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.zhK911/_old 2008-03-12 19:51:54.000000000 +0100 +++ /var/tmp/diff_new_pack.zhK911/_new 2008-03-12 19:51:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.1.8) +# spec file for package linuxrc (Version 3.1.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,9 +17,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.1.8 +Version: 3.1.9 Release: 1 -Source: linuxrc-3.1.8.tar.bz2 +Source: linuxrc-3.1.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +54,9 @@ %doc linuxrc.html %changelog +* Wed Mar 12 2008 snwint@suse.de +- yep is now smt +- Tejun: allow module options to be passed simply as 'module.option' * Wed Feb 27 2008 snwint@suse.de - unmount all discs in case YaST could not do it itself (fate #302647) - support Y2GDB option (fate #302346) ++++++ linuxrc-3.1.8.tar.bz2 -> linuxrc-3.1.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.8/Changelog new/linuxrc-3.1.9/Changelog --- old/linuxrc-3.1.8/Changelog 2008-02-27 11:23:45.000000000 +0100 +++ new/linuxrc-3.1.9/Changelog 2008-03-12 16:18:33.000000000 +0100 @@ -1,3 +1,7 @@ +12/3/2008: v3.1.9 + - yep is now smt + - Tejun: allow module options to be passed simply as 'module.option' + 27/2/2008: v3.1.8 - support Y2GDB option (fate #302346) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.8/file.c new/linuxrc-3.1.9/file.c --- old/linuxrc-3.1.8/file.c 2008-02-27 11:26:28.000000000 +0100 +++ new/linuxrc-3.1.9/file.c 2008-03-12 15:45:53.000000000 +0100 @@ -272,8 +272,8 @@ { key_nomodprobe, "nomodprobe", kf_cfg + kf_cmd_early }, { key_device, "Device", kf_cfg + kf_cmd }, { key_nomdns, "NoMDNS", kf_cfg + kf_cmd }, - { key_yepurl, "yepurl", kf_cfg + kf_cmd }, - { key_yepcert, "yepcert", kf_cfg + kf_cmd }, + { key_yepurl, "smturl", kf_cfg + kf_cmd }, + { key_yepcert, "smtcert", kf_cfg + kf_cmd }, { key_mediacheck, "mediacheck", kf_cfg + kf_cmd }, { key_y2gdb, "Y2GDB", kf_cfg + kf_cmd }, }; @@ -1162,14 +1162,32 @@ if(*f->value) str_copy(&config.rootimage2, f->value); break; + case key_none: + /* assume kernel module option if it can be parsed as 'module.option' */ + + s = strchr(f->unparsed, '.'); + t = strchr(f->unparsed, ' '); + if(!s || (t && t < s)) break; /* no spaces in module name */ + str_copy(&f->value, f->unparsed); + + /* continue with key_options */ + case key_options: if(*f->value) { - if((s = strchr(f->value, '='))) { - *s++ = 0; + /* allow both module.param and module=param */ + s = f->value; + strsep(&s, ".="); + if(s) { if(config.debug >= 2) fprintf(stderr, "options[%s] = \"%s\"\n", f->value, s); - sl = slist_add(&config.module.options, slist_new()); - sl->key = strdup(f->value); - sl->value = strdup(s); + sl = slist_getentry(config.module.options, f->value); + if(!sl) { + sl = slist_add(&config.module.options, slist_new()); + sl->key = strdup(f->value); + sl->value = strdup(s); + } + else { + strprintf(&sl->value, "%s %s", sl->value, s); + } } } break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.8/VERSION new/linuxrc-3.1.9/VERSION --- old/linuxrc-3.1.8/VERSION 2008-02-27 11:23:16.000000000 +0100 +++ new/linuxrc-3.1.9/VERSION 2008-03-12 15:33:30.000000000 +0100 @@ -1 +1 @@ -3.1.8 +3.1.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de