Author: mzugec Date: Wed Jun 10 09:56:13 2009 New Revision: 57523 URL: http://svn.opensuse.org/viewcvs/yast?rev=57523&view=rev Log: NetworkInterfaces - possible to not use LABEL for aliases (bnc#471253) (bnc#507640) Modified: branches/tmp/SLE-11-SP1-Stash/yast2/VERSION branches/tmp/SLE-11-SP1-Stash/yast2/library/network/src/NetworkInterfaces.ycp branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Modified: branches/tmp/SLE-11-SP1-Stash/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/VERSION?rev=57523&r1=57522&r2=57523&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/VERSION Wed Jun 10 09:56:13 2009 @@ -1 +1 @@ -2.17.68 +2.17.69 Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/library/network/src/NetworkInterfaces.ycp?rev=57523&r1=57522&r2=57523&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/library/network/src/NetworkInterfaces.ycp Wed Jun 10 09:56:13 2009 @@ -698,7 +698,7 @@ path base = add (.network.value, dev); // look in OriginalDevs because we need to catch all variables // of the alias - foreach (string key, any dummy, OriginalDevs[typ, num, "_aliases", anum]:$[], { + foreach (string key, any dummy, OriginalDevs[typ, dev, "_aliases", anum]:$[], { path p = add (base, key + "_" + anum); y2debug ("deleting: %1", p); SCR::Write (p, nil); @@ -739,7 +739,7 @@ // writing, but we create it in 2 ways so it's // better here. Actually it does not work because // the edit dialog nukes LABEL :-( - boolean seen_label = false; +// boolean seen_label = false; if (size(amap["IPADDR"]:"")>0 && size(amap["NETMASK"]:"")>0){ amap["IPADDR"] = sformat("%1/%2", amap["IPADDR"]:"", Netmask::ToBits(amap["NETMASK"]:"")); amap=remove(amap, "NETMASK"); @@ -755,13 +755,14 @@ maplist(string ak, string av, amap, { string akk = ak + "_" + anum; ShellSafeWrite (topath (p + akk), av); - seen_label = seen_label || ak == "LABEL"; +// seen_label = seen_label || ak == "LABEL"; }); - +/* if (!seen_label) { ShellSafeWrite (topath (p + ("LABEL_" + anum)), anum); } +*/ }); } /* Write regular keys */ Modified: branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes?rev=57523&r1=57522&r2=57523&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Wed Jun 10 09:56:13 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jun 10 09:55:30 CEST 2009 - mzugec@suse.cz + +- NetworkInterfaces - possible to not use LABEL for aliases +(bnc#471253) (bnc#507640) +- 2.17.69 + +------------------------------------------------------------------- Tue May 26 18:59:03 CEST 2009 - juhliarik@suse.cz - added fix for problem with parsing command line (bnc#462276) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org