Author: mzugec Date: Tue Jul 22 12:47:00 2008 New Revision: 49315 URL: http://svn.opensuse.org/viewcvs/yast?rev=49315&view=rev Log: don't write udev rules in 2nd stage from AY Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanUdevAuto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=49315&r1=49314&r2=49315&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Jul 22 12:47:00 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=49315&r1=49314&r2=49315&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Jul 22 12:47:00 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 22 12:46:07 CEST 2008 - mzugec@suse.cz + +- 2.17.10 +- don't write udev rules in 2nd stage from AY + +------------------------------------------------------------------- Fri Jul 18 13:13:47 CEST 2008 - mzugec@suse.cz - don't replace udev rules file by AY if nothing defined in profile Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=49315&r1=49314&r2=49315&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Tue Jul 22 12:47:00 2008 @@ -373,14 +373,12 @@ if(Abort()) return false; /* Progress step 2 */ ProgressNextStage(_("Writing /etc/modprobe.conf...")); - // FIXME: MOD WriteModules(); -// NetworkModules::Write("netcard"); sleep(sl); if(Abort()) return false; /* Progress step 3 - multiple devices may be present, really plural*/ ProgressNextStage(_("Writing device configuration...")); - LanItems::WriteUdevDriverRules(); + if (!Mode::autoinst()) LanItems::WriteUdevDriverRules(); NetworkInterfaces::Write("netcard"); // WriteDevices(); sleep(sl); Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.ycp?rev=49315&r1=49314&r2=49315&view=diff ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Tue Jul 22 12:47:00 2008 @@ -73,7 +73,7 @@ "# You can modify it, as long as you keep each rule on a single line." ]; list<string> rules = []; foreach(map rule, udev_rules, { - rules = add(rules, sformat("SUBSYSTEM==\"net\", DRIVERS==\"?*\", %1==\"%2\", NAME=\"%3\"", + rules = add(rules, sformat("SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", %1==\"%2\", NAME=\"%3\"", rule["rule"]:"", rule["value"]:"", rule["name"]:"")); }); if (size(rules)>0){ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org