Author: mvidner Date: Wed Apr 20 14:44:07 2011 New Revision: 63841 URL: http://svn.opensuse.org/viewcvs/yast?rev=63841&view=rev Log: Reverting the unfinished FCoE (FATE#306855) and VLAN (FATE#309240) support. (removing .changes contents is OK because they were never submitted to IBS) for i in network yast; do pushd $i svn merge -r 63028:63005 . popd done svn ci network yast Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp branches/SuSE-Code-11-SP1-Branch/yast2/VERSION branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkInterfaces.ycp branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkStorage.ycp branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes 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=63841&r1=63840&r2=63841&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 Wed Apr 20 14:44:07 2011 @@ -5,24 +5,12 @@ - 2.17.153 ------------------------------------------------------------------- -Thu Dec 23 00:44:01 CET 2010 - mzugec@suse.de - -- ifcfg-ethX.Y style config files for VLAN(fate#309240) -- 2.17.152 - -------------------------------------------------------------------- Fri Dec 17 10:05:06 CET 2010 - mzugec@suse.de - L3: don't propose bridge for vbox (bnc#648044) - 2.17.150 ------------------------------------------------------------------- -Wed Dec 15 09:22:32 CET 2010 - mzugec@suse.de - -- fate#306855: FCoE boot support -- 2.17.151 - -------------------------------------------------------------------- Mon Dec 6 15:46:53 CET 2010 - mzugec@suse.cz - L3: AY Layer2 support - fixed portname option (bnc#573607) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp?rev=63841&r1=63840&r2=63841&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp Wed Apr 20 14:44:07 2011 @@ -266,20 +266,6 @@ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); } break; - case 3: // FCoE case - create VLAN configuration - map cmd = (map) SCR::Execute(.target.bash_output, - "ls -la /sys/block/*|grep target|grep eth|cut -d'>' -f2|cut -d'/' -f5|uniq"); - y2internal("cmd %1", cmd); - if (cmd["exit"]:-1==0){ - string ifcfg = splitstring(cmd["stdout"]:"", "\n")[0]:""; - y2internal("ifcfg: %1", ifcfg); - string config=sformat("BOOTPROTO=\"static\"\nSTARTMODE=\"nfsroot\" -ETHERDEVICE=\"%1\"\nUSERCONTROL=\"no\"\n", splitstring(ifcfg, ".")[0]:""); - y2internal("config: %1", config); - string config_file=sformat("/etc/sysconfig/network/ifcfg-%1", ifcfg); - y2internal("filename: %1", config_file); - SCR::Write(.target.string, config_file, config); - } else y2error("Command failed."); case 2: network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); break; Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp?rev=63841&r1=63840&r2=63841&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Wed Apr 20 14:44:07 2011 @@ -124,7 +124,6 @@ void InitVLANSlave(string key) { settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; - settings["VLAN_ID"] = tointeger(NetworkInterfaces::Current["VLAN_ID"]:"0"); list items = []; map configurations = NetworkInterfaces::FilterDevices("netcard"); @@ -134,19 +133,7 @@ items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), settings["ETHERDEVICE"]:""==devname) ); }); }); - UI::ChangeWidget(`id(`vlan_eth), `Items, items); - UI::ChangeWidget(`id(`vlan_id), `Value, settings["VLAN_ID"]:0); -} - - -symbol HandleVLANSlave(string key, map event){ - if (event["EventReason"]:""=="ValueChanged"){ - string configname = sformat("%1.%2", UI::QueryWidget(`id(`vlan_eth), `Value), UI::QueryWidget(`id(`vlan_id), `Value)); - NetworkInterfaces::Name = configname; - LanItems::Items[LanItems::current, "ifcfg"]= configname; - UI::ChangeWidget(`id("IFCFGID"), `Value, configname); - } - return nil; + UI::ChangeWidget(`id(key), `Items, items); } /** @@ -156,8 +143,7 @@ */ void StoreVLANSlave(string key, map event) { - settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(`vlan_eth), `Value); - settings["VLAN_ID"] = UI::QueryWidget (`id(`vlan_id), `Value); + settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(key), `Value); } @@ -648,15 +634,11 @@ "help": help["bridge_ports"]:"", ], "ETHERDEVICE": $[ - "widget": `custom, - "custom_widget": - `HBox( - `ComboBox(`id(`vlan_eth), `opt(`notify), _("Real Interface for &VLAN"), []), - `IntField(`id(`vlan_id), `opt(`notify), _("VLAN id"), 0, 9999, 0) - ), + "widget": `combobox, + "label": _("Real Interface for &VLAN"), + "items" : [ ], "opt": [`hstretch], "init": InitVLANSlave, - "handle": HandleVLANSlave, "store": StoreVLANSlave, "help": help["etherdevice"]:"", ], @@ -895,7 +877,7 @@ // interface types. It will work in some cases, like // overriding eth to wlan but not in others where we would // need to change the contents of the dialog. #30890. - LanItems::type!="vlan" ? "IFCFGTYPE" : `Empty(), + "IFCFGTYPE", `HSpacing(1.5), `MinWidth(30, "IFCFGID"), `HSpacing(0.5), @@ -1138,7 +1120,6 @@ if (LanItems::type == "vlan"){ LanItems::vlan_etherdevice = settings["ETHERDEVICE"]:""; - LanItems::vlan_id = tostring((integer)settings["VLAN_ID"]:0); } else if (LanItems::type == "br"){ LanItems::bridge_ports = settings["BRIDGE_PORTS"]:""; } else if (contains(["tun", "tap"], LanItems::type)){ Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp?rev=63841&r1=63840&r2=63841&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp Wed Apr 20 14:44:07 2011 @@ -538,10 +538,6 @@ y2milestone("interface without hwinfo, proposing STARTMODE=auto"); LanItems::startmode="auto"; } - if (LanItems::type=="vlan"){ - string vlanid=(string) UI::QueryWidget(`id(`num), `Value); - NetworkInterfaces::Current["VLAN_ID"] = vlanid; - } } string driver = (string) UI::QueryWidget(`modul, `Value); 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=63841&r1=63840&r2=63841&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 Wed Apr 20 14:44:07 2011 @@ -84,7 +84,6 @@ // VLAN option global string vlan_etherdevice=""; -global string vlan_id=""; // interfaces attached to bridge (list delimited by ' ') global string bridge_ports=""; @@ -829,7 +828,6 @@ usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes"; description = GetDeviceVar (devmap, defaults, "NAME"); bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS"); - vlan_id = GetDeviceVar(devmap, defaults, "VLAN_ID"); bond_slaves=[]; foreach(any key, any value, devmap, @@ -1111,7 +1109,7 @@ newdev["NAME"] = description; // L3: bnc#585458 // if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type; -// if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type) newdev["INTERFACETYPE"]=type; + if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type) newdev["INTERFACETYPE"]=type; if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes"; @@ -1140,7 +1138,6 @@ if (type=="vlan"){ newdev["ETHERDEVICE"]=vlan_etherdevice; - newdev["VLAN_ID"]=vlan_id; } if (type=="br"){ newdev["BRIDGE_PORTS"]=bridge_ports; @@ -1214,7 +1211,6 @@ } NetworkInterfaces::Name = Items[current, "ifcfg"]:""; NetworkInterfaces::Current = newdev; -y2internal("%1", newdev); if (!NetworkInterfaces::Commit()) Items[current, "ifcfg"]=""; } else { Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/VERSION?rev=63841&r1=63840&r2=63841&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/VERSION Wed Apr 20 14:44:07 2011 @@ -1 +1 @@ -2.17.94 +2.17.92 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkInterfaces.ycp?rev=63841&r1=63840&r2=63841&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkInterfaces.ycp Wed Apr 20 14:44:07 2011 @@ -182,8 +182,6 @@ global string GetType(string dev) { string type = ifcfg_part (dev, "1"); - // test if this is VLAN (ethX.vlanid) - if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\.[[:digit:]]+$")) return "vlan"; foreach(string dev_type,map confs, Devices, { if (haskey(confs, dev)){ string int_type = confs[dev, "INTERFACETYPE"]:""; Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkStorage.ycp?rev=63841&r1=63840&r2=63841&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkStorage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkStorage.ycp Wed Apr 20 14:44:07 2011 @@ -40,21 +40,6 @@ } integer network_based=0; - // test for multipath - if (network_based==0 && issubstring(device, "/dev/dm-")) { - y2warning("multipath detected!"); - string dev_name = splitstring(device, "/")[2]:""; - y2milestone("Multipath device name %1", dev_name); - map cmd = (map)SCR::Execute(.target.bash_output, sformat("ls /sys/block/%1/slaves/", dev_name)); - y2milestone("Show slaves command:%1", cmd); - if (cmd["exit"]:-1==0){ - // FIXME: what about more slaves? - list<string> slaves = splitstring(cmd["stdout"]:"", "\n"); - integer nb = isDiskOnNetwork(sformat("/dev/%1", slaves[0]:"")); - if (nb>0) network_based=nb; - } else y2error("Error while executed show slaves commad:%1", cmd["stderr"]:""); - } - // test for LVM if (network_based==0 && issubstring(device, "/dev/mapper/")) { y2warning("LVM detected!"); @@ -99,7 +84,7 @@ } } - // test for nfs (bnc#384420) +// test for nfs (bnc#384420) if (network_based==0) { string space="[[:space:]]"; if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){ @@ -107,21 +92,6 @@ network_based=2; } } - - //test for FCoE - if (network_based==0){ - if (issubstring(device, "/dev/")){ - device = splitstring(device, "/")[2]:""; - } - string sys=sformat("/sys/class/block/%1", device); - if (FileUtils::Exists(sys)){ - if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q target", sys))==0){ - y2warning("FCoE detected!"); - network_based=3; - } - } - } - return network_based; } Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes?rev=63841&r1=63840&r2=63841&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Wed Apr 20 14:44:07 2011 @@ -1,16 +1,4 @@ ------------------------------------------------------------------- -Thu Dec 23 00:40:41 CET 2010 - mzugec@suse.de - -- ifcfg-ethX.Y style config files for VLAN(fate#309240) -- 2.17.94 - -------------------------------------------------------------------- -Wed Dec 15 09:24:02 CET 2010 - mzugec@suse.de - -- fate#306855: FCoE boot support -- 2.17.93 - -------------------------------------------------------------------- Mon Mar 29 15:12:35 CEST 2010 - ug@suse.de - fixed a bug with *.desktop file translations -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org