Author: mzugec Date: Thu Oct 21 15:45:02 2010 New Revision: 62662 URL: http://svn.opensuse.org/viewcvs/yast?rev=62662&view=rev Log: L3: setup kernel module options (bnc#645389) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=62662&r1=62661&r2=62662&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Thu Oct 21 15:45:02 2010 @@ -1 +1 @@ -2.17.141 +2.17.142 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=62662&r1=62661&r2=62662&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Thu Oct 21 15:45:02 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 21 15:41:33 CEST 2010 - mzugec@suse.cz + +- L3: setup kernel module options (bnc#645389) +- 2.17.142 + +------------------------------------------------------------------- Fri Aug 6 14:20:40 CEST 2010 - mzugec@suse.de - Proxy: correctly enclose user:password into quotes (bnc#616695) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp?rev=62662&r1=62661&r2=62662&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp Thu Oct 21 15:45:02 2010 @@ -182,8 +182,8 @@ udev_net_rules = (map<string, any>)SCR::Read(.udev_persistent.net); y2milestone ("Reading driver options ..."); - foreach(string driver, SCR::Dir(.modprobe.network.options), { - string pth=sformat(".modprobe.network.options.%1",driver); + foreach(string driver, SCR::Dir(.modules.options), { + string pth=sformat(".modules.options.%1",driver); // driver_options[driver] = SCR::Read(topath(pth)); foreach(string key, string value, (map<string, string>)SCR::Read(topath(pth)), { driver_options[driver] = sformat("%1%2%3=%4", driver_options[driver]:"", @@ -236,7 +236,6 @@ if (size(Items[key, "udev", "net"]:[])>0) { string dev_name = Items[key, "hwinfo", "dev_name"]:""; current=key; -// net_rules = add(net_rules, sformat("SUBSYSTEM==\"net\", DRIVERS==\"?*\", %1, NAME=\"%2\"", GetItemUdev("ATTR{address}"), GetItemUdev("NAME"))); net_rules = add(net_rules, mergestring(Items[key, "udev", "net"]:[], ", ")); if (dev_name!=GetItemUdev("NAME")) { changed_devices = add(changed_devices, dev_name); @@ -257,9 +256,9 @@ val[ l[0]:"" ]=l[1]:""; }); if (!hasAnyValue(value)) val=nil; - SCR::Write(add(.modprobe.network.options, key), val); + SCR::Write(add(.modules.options, key), val); }); - SCR::Write(.modprobe.network,nil); + SCR::Write(.modules,nil); } /** @@ -690,7 +689,7 @@ y2milestone("device=%1", device); hw=hardware; if(Arch::s390() && operation==`add){ - y2internal("Propose chan_ids values for %1", hw); + y2milestone("Propose chan_ids values for %1", hw); integer devid = 0; string devstr = ""; string s390chanid = "[0-9]+\\.[0-9]+\\."; Modified: branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out?rev=62662&r1=62661&r2=62662&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out (original) +++ branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out Thu Oct 21 15:45:02 2010 @@ -25,7 +25,7 @@ Log hardware detection failure Read .etc.install_inf.BrokenModules nil Read .udev_persistent.net nil -Dir .modprobe.network.options: [] +Dir .modules.options: [] Read .udev_persistent.drivers nil Read .target.lstat "/etc/sysconfig/network/ifcfg-eth-pcmcia" nil Read .target.lstat "/etc/sysconfig/network/ifcfg-eth-usb" nil -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org