Author: mzugec Date: Mon Nov 15 12:38:47 2010 New Revision: 62854 URL: http://svn.opensuse.org/viewcvs/yast?rev=62854&view=rev Log: correctly apply BusID based udev rules in AY (bnc#648270) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/LanUdevAuto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62854&r1=62853&r2=62854&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Nov 15 12:38:47 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62854&r1=62853&r2=62854&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Nov 15 12:38:47 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 15 12:37:29 CET 2010 - mzugec@suse.cz + +- correctly apply BusID based udev rules in AY (bnc#648270) +- 2.20.3 + +------------------------------------------------------------------- Mon Nov 8 15:28:20 CET 2010 - mzugec@suse.cz - TP-L3: if possible, for temporary installation network use same Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.ycp?rev=62854&r1=62853&r2=62854&view=diff ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Mon Nov 15 12:38:47 2010 @@ -237,7 +237,20 @@ y2milestone("MAC address matched with device:%1", rule["name"]:""); break; } - } + } else if (rule["rule"]:""=="KERNELS"){ + y2milestone("rule: %1", rule); + /* input parameter is MAC address, output is BusID of matched device */ + map cmd = (map)SCR::Execute(.target.bash_output, + sformat( "DEVICE=$(grep '%1' /sys/class/net/*/address);KERNELS=$(ls -l \"$(echo ${DEVICE%%/*})/device\");echo ${KERNELS##*/}|tr -d '\n'", mac)); + if (cmd["exit"]:-1==0){ + y2milestone("cmd output:%1", cmd["stdout"]:""); + if (cmd["stdout"]:""==rule["value"]:""){ + y2internal("match!"); + devname=rule["name"]:""; + } + } + } else + y2error("Unknown rule for:%1", rule); }); } else y2warning("No MAC address to compare."); return devname; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org