[yast-commit] r45542 - in /trunk/network: package/yast2-network.changes src/lan/hardware.ycp src/modules/Lan.ycp src/modules/LanItems.ycp

Author: mzugec Date: Mon Mar 17 22:16:19 2008 New Revision: 45542 URL: http://svn.opensuse.org/viewcvs/yast?rev=45542&view=rev Log: support for writing driver parameters (bnc#362535) Modified: trunk/network/package/yast2-network.changes trunk/network/src/lan/hardware.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=45542&r1=45541&r2=45542&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Mar 17 22:16:19 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 17 20:50:58 CET 2008 - mzugec@suse.de + +- support for writing driver parameters (bnc#362535) +- 2.16.26 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=45542&r1=45541&r2=45542&view=diff ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Mon Mar 17 22:16:19 2008 @@ -78,7 +78,6 @@ void initHardware(){ hardware = $[]; // hardware["modul"] = NetworkModules::Alias; // FIXME: MOD Lan::Module["module"]:""; -// hardware["options"] = NetworkModules::Options; // FIXME: MOD Lan::Module["options"]:""; hardware["hotplug"] = LanItems::hotplug; y2milestone("hotplug=%1", LanItems::hotplug); hardware["modules_from_hwinfo"] = LanItems::GetItemModules(hardware["modul"]:"" ); @@ -102,6 +101,8 @@ hardware["default_device"] = hasAnyValue(driver) ? driver : LanItems::getCurrentItem()["hwinfo", "module"]:"" ; + hardware["options"] = LanItems::driver_options[hardware["default_device"]:""]:""; + // #38213, remember device id when we switch back from pcmcia/usb hardware["non_hotplug_device_id"] = hardware["device"]:""; /* @@ -162,7 +163,7 @@ /* Text entry label */ `ComboBox(`id(`modul), `opt(`editable), _("&Module Name"), hardware["modules_from_hwinfo"]:[]), `HSpacing(0.2), - `TextEntry(`id(`options), `opt(`disabled), Label::Options (), hardware["options"]:"") + `TextEntry(`id(`options), Label::Options (), hardware["options"]:"") ), `VSpacing(0.4), CheckBoxes, @@ -224,7 +225,7 @@ ChangeWidgetIfExists(`id(`usb), `Enabled, (hardware["hotplug"]:"" == "usb" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); ChangeWidgetIfExists(`id(`pcmcia), `Enabled, (hardware["hotplug"]:"" == "pcmcia" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); UI::ChangeWidget(`id(`device_name), `Enabled, false); - UI::ChangeWidget(`id(`options), `Enabled, false); +// UI::ChangeWidget(`id(`options), `Enabled, false); UI::ChangeWidget(`id(`device_name), `Value, LanItems::GetItemUdev()[1]:""); @@ -490,7 +491,9 @@ LanItems::Items[LanItems::current, "udev"]= $[]; } - LanItems::setDriver((string) UI::QueryWidget(`modul, `Value)); + string driver = (string) UI::QueryWidget(`modul, `Value); + LanItems::setDriver(driver); + LanItems::driver_options[driver] = (string) UI::QueryWidget(`options, `Value); } Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=45542&r1=45541&r2=45542&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Mar 17 22:16:19 2008 @@ -379,7 +379,7 @@ if(Abort()) return false; /* Progress step 3 - multiple devices may be present, really plural*/ ProgressNextStage(_("Writing device configuration...")); - LanItems::WriteUdevRules(); + LanItems::WriteUdevDriverRules(); NetworkInterfaces::Write("netcard"); // WriteDevices(); sleep(sl); Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=45542&r1=45541&r2=45542&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Mon Mar 17 22:16:19 2008 @@ -17,6 +17,7 @@ global map Items = $[]; global list<map> Hardware = []; global map udev_net_rules = $[]; +global map driver_options = $[]; global string interfacename=""; @@ -163,9 +164,20 @@ include "network/hardware.ycp"; -boolean ReadUdevRules(){ +boolean ReadUdevDriverRules(){ y2milestone ("Reading udev rules ..."); udev_net_rules = (map)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); +// driver_options[driver] = SCR::Read(topath(pth)); + foreach(string key, string value, (map)SCR::Read(topath(pth)), { + driver_options[driver] = sformat("%1%2%3=%4", driver_options[driver]:"", + (size(driver_options[driver]:"")>0)?" ":"", key, value); + }); + }); + return true; } @@ -179,18 +191,13 @@ else if (issubstring(row, "NAME")) udevs[1]=regexpsub (row, ".*=[\"]*([^ ]*)\"$", "\\1"); }); -/* - udevs[0]=Items[current, "udev", "net", 2]:""; - if (regexpmatch (Items[current, "udev", "net", 3]:"", ".*=[^ ]*\"$")) - udevs[1]=regexpsub (Items[current, "udev", "net", 3]:"", ".*=[\"]*([^ ]*)\"$", "\\1"); -*/ } return udevs; } -global void WriteUdevRules(){ +global void WriteUdevDriverRules(){ map udev_drivers_rules = $[]; foreach(integer key, (list<integer>)Map::Keys(Items), { if (hasAnyValue(Items[key, "udev", "driver"]:"")) @@ -211,18 +218,25 @@ changed_devices = add(changed_devices, dev_name); force_restart=true; } - } }); - - // SCR::Write(.udev_persistent.rules_comment, comment); - // SCR::Write(.udev_persistent.rules, rules); - SCR::Write(.udev_persistent.rules, net_rules); SCR::Write(.udev_persistent.nil, []); foreach(string dev, changed_devices, { - y2internal("renaming devices : %1", SCR::Execute(.target.bash_output, sformat("hwdown %1 && hwup %1", dev))); + y2milestone("renaming devices : %1", SCR::Execute(.target.bash_output, sformat("hwdown %1 && hwup %1", dev))); }); + + // write rules from driver + foreach(string key, string value, (map)driver_options, { + map val=$[]; + foreach(string k, splitstring(value, " "), { + list<string> l = splitstring(k, "="); + val[ l[0]:"" ]=l[1]:""; + }); + if (!hasAnyValue(value)) val=nil; + SCR::Write(add(.modprobe.network.options, key), val); + }); + SCR::Write(.modprobe.network,nil); } /** @@ -305,7 +319,7 @@ global void ReadHw(){ Items=$[]; Hardware = ReadHardware("netcard"); - ReadUdevRules(); + ReadUdevDriverRules(); map udev_drivers_rules = (map)SCR::Read(.udev_persistent.drivers); foreach(map hwitem, Hardware, { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org