Author: kmachalkova Date: Fri Sep 21 15:54:28 2007 New Revision: 41024 URL: http://svn.opensuse.org/viewcvs/yast?rev=41024&view=rev Log: Correct setting of device number and module for manually added cards Modified: trunk/network/src/lan/hardware.ycp Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=41024&r1=41023&r2=41024&view=diff ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Fri Sep 21 15:54:28 2007 @@ -79,8 +79,14 @@ hardware["type"] = "eth"; } hardware["realtype"] = NetworkDevices::RealType(hardware["type"]:"", hardware["hotplug"]:""); - if (hasAnyValue(NetworkDevices::Name)) hardware["device"] = NetworkDevices::device_num(NetworkDevices::Name); - else hardware["device"] = LanItems::device; + /*if (hasAnyValue(NetworkDevices::Name)) + { + hardware["device"] = NetworkDevices::device_num(NetworkDevices::Name); + }*/ + + //Use rather LanItems::device, so that device number is initialized correctly at all times (#308763) + hardware["device"] = LanItems::device; + string driver = LanItems::getCurrentItem()["udev", "driver"]:""; @@ -438,16 +444,23 @@ void storeHW (string key, map event) { if (LanItems::operation==`add){ - LanItems::type = (string) UI::QueryWidget(`id(`dev), `Value); - string nm = (string) UI::QueryWidget(`id(`num), `Value); - string name=NetworkDevices::device_name(LanItems::type, nm); - if(contains(NetworkDevices::List(""), name)) { - Popup::Error(sformat(_("Configuration name %1 (%2) already exists. + + LanItems::type = (string) UI::QueryWidget(`id(`dev), `Value); + string nm = (string) UI::QueryWidget(`id(`num), `Value); + //Remember current device number (#308763) + LanItems::device = nm; + + string name=NetworkDevices::device_name(LanItems::type, nm); + if(contains(NetworkDevices::List(""), name)) { + Popup::Error(sformat(_("Configuration name %1 (%2) already exists. Choose a different one."), nm, NetworkDevices::device_name(hardware["type"]:"", nm))); - UI::SetFocus(`id(`num)); - } - NetworkDevices::Name = name; - LanItems::Items[LanItems::current, "ifcfg"]= name; + UI::SetFocus(`id(`num)); + } + + NetworkDevices::Name = name; + LanItems::Items[LanItems::current, "ifcfg"]= name; + //Initialize udev map, so that setDriver (see below) sets correct module + LanItems::Items[LanItems::current, "udev"]= $[]; } LanItems::setDriver((string) UI::QueryWidget(`modul, `Value)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org