Author: mzugec Date: Fri Jul 18 13:21:22 2008 New Revision: 49249 URL: http://svn.opensuse.org/viewcvs/yast?rev=49249&view=rev Log: don't replace udev rules file by AY if nothing defined in profile (bnc#408338) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp trunk/network/src/modules/LanUdevAuto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=49249&r1=49248&r2=49249&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Jul 18 13:21:22 2008 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=49249&r1=49248&r2=49249&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Jul 18 13:21:22 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 18 13:13:47 CEST 2008 - mzugec@suse.cz + +- don't replace udev rules file by AY if nothing defined in profile + (bnc#408338) +- 2.17.9 + +------------------------------------------------------------------- Thu Jul 17 18:12:13 CEST 2008 - mzugec@suse.de - default options for bonding (bnc#404449) Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=49249&r1=49248&r2=49249&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Fri Jul 18 13:21:22 2008 @@ -371,6 +371,9 @@ string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); string net_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, net_srcfile); +y2internal("udev_rules_destdir %1", udev_rules_destdir); +y2internal("net_destfile %1", net_destfile); + //Do not create udev_rules_destdir if it already exists (in case of update) //(bug #293366, c#7) @@ -378,17 +381,19 @@ { y2milestone("%1 does not exist yet, creating it", udev_rules_destdir); WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", udev_rules_destdir)); - } + } else + y2internal("file %1 exists", udev_rules_destdir); if (! FileUtils::Exists( net_destfile )) { y2milestone("Copying %1 to the installed system ", net_srcfile); WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, net_srcfile, net_destfile)); - } + } else + y2internal("file %1 exists", net_destfile); // close and chroot back - WFM::SCRClose (new_SCR); WFM::SCRSetDefault (old_SCR); + WFM::SCRClose (new_SCR); if (Mode::autoinst()){ import "LanUdevAuto"; Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.ycp?rev=49249&r1=49248&r2=49249&view=diff ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Fri Jul 18 13:21:22 2008 @@ -76,8 +76,12 @@ rules = add(rules, sformat("SUBSYSTEM==\"net\", DRIVERS==\"?*\", %1==\"%2\", NAME=\"%3\"", rule["rule"]:"", rule["value"]:"", rule["name"]:"")); }); - SCR::Write(.udev_persistent.rules_comment, comment); - SCR::Write(.udev_persistent.rules, rules); + if (size(rules)>0){ + y2milestone("Writing AY udev rules for network (will replace original rules from 1st stage)"); + SCR::Write(.udev_persistent.rules_comment, comment); + SCR::Write(.udev_persistent.rules, rules); + } else + y2milestone("No udev rules defined by AY, nothing to write (keep original file)"); return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org