Author: mvidner Date: Mon Aug 15 13:18:04 2011 New Revision: 65343 URL: http://svn.opensuse.org/viewcvs/yast?rev=65343&view=rev Log: biosdevname: check just the vendor, don't compare interface names (bnc#712043). svn merge -c65342 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/packager . Modified: trunk/packager/ (props changed) trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=65343&r1=65342&r2=65343&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon Aug 15 13:18:04 2011 @@ -1 +1 @@ -2.21.9 +2.21.10 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=65343&r1=65342&r2=65343&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Aug 15 13:18:04 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.21.10 + +------------------------------------------------------------------- Fri Aug 5 12:34:31 CEST 2011 - tgoettlicher@suse.de - fixed .desktop file (bnc #681249) Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=65343&r1=65342&r2=65343&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Mon Aug 15 13:18:04 2011 @@ -797,40 +797,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() @@ -886,7 +852,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