Author: mzugec Date: Tue Apr 28 16:03:47 2009 New Revision: 57007

URL: http://svn.opensuse.org/viewcvs/yast?rev=57007&view=rev Log: correctly read/write module options (bnc#487656)

Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/hardware.ycp trunk/network/src/modules/LanItems.ycp

Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=57007&r1=... ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Apr 28 16:03:47 2009 @@ -1 +1 @@ -2.18.29 +2.18.30

Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.cha... ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Apr 28 16:03:47 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 28 16:02:37 CEST 2009 - mzugec@suse.de + +- correctly read/write module options (bnc#487656) +- 2.18.30 + +------------------------------------------------------------------- Mon Apr 27 10:15:25 CEST 2009 - mzugec@suse.de

- improved "device renaming" functionality (bnc#447480) and

Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=... ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Tue Apr 28 16:03:47 2009 @@ -506,7 +506,7 @@ y2milestone("interface without hwinfo, proposing STARTMODE=auto"); LanItems::startmode="auto"; } -} + }

string driver = (string) UI::QueryWidget(`modul, `Value); LanItems::setDriver(driver);

Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?... ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Tue Apr 28 16:03:47 2009 @@ -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]:"", @@ -256,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); }

/**