Author: mvidner Date: Mon Aug 15 13:10:59 2011 New Revision: 65342 URL: http://svn.opensuse.org/viewcvs/yast?rev=65342&view=rev Log: biosdevname: check just the vendor, don't compare interface names (bnc#712043). Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/VERSION?rev=65342&r1=65341&r2=65342&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/VERSION Mon Aug 15 13:10:59 2011 @@ -1 +1 @@ -2.17.86 +2.17.87 Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes?rev=65342&r1=65341&r2=65342&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes Mon Aug 15 13:10:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 15 13:10:49 CEST 2011 - mvidner@suse.cz + +- biosdevname: check just the vendor, don't compare interface names (bnc#712043). +- 2.17.87 + +------------------------------------------------------------------- Tue Aug 2 15:41:35 UTC 2011 - lslezak@suse.cz - fixed biosdevname package installation (bnc#709797) Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp?rev=65342&r1=65341&r2=65342&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Mon Aug 15 13:10:59 2011 @@ -746,40 +746,6 @@ } /* - * check whether there is a bios name for a network interface - */ - boolean detectBiosDevNames() - { - boolean ret = false; - list<map> netifs = (list<map>)SCR::Read(.probe.netif); - - foreach(map netif, netifs, { - string dev_name = netif["dev_name"]:"unknown"; - string command = sformat("/sbin/biosdevname --policy all_names -i '%1'", String::Quote(dev_name)); - y2milestone("Executing: %1", command); - - map out = (map)SCR::Execute(.target.bash_output, command); - y2milestone("Result: %1", out); - - if (out["exit"]:-1 == 0) - { - string bios_name = String::FirstChunk(out["stdout"]:"", "\n"); - - if (bios_name != nil && bios_name != "" && bios_name != dev_name) - { - y2milestone("Found BIOS name for %1: %2", netif, bios_name); - ret = true; - } - } - } - ); - - y2milestone("Detected BIOS name: %1", ret); - - return ret; - } - - /* * CHeck whether this is a Dell system */ boolean DellSystem() @@ -835,7 +801,7 @@ y2milestone("Missing biosdevname option, autodetecting..."); if (DellSystem()) { - add_biosdevname = detectBiosDevNames(); + add_biosdevname = true; } } else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org