Author: kmachalkova Date: Wed Sep 12 13:46:34 2007 New Revision: 40867 URL: http://svn.opensuse.org/viewcvs/yast?rev=40867&view=rev Log: Do not rewrite udev rules file during update (if it already exists in /mnt) (#293366c#7) Modified: trunk/network/src/clients/save_network.ycp Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=40867&r1=40866&r2=40867&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Sep 12 13:46:34 2007 @@ -327,10 +327,17 @@ // re-trigger event for net WFM::Execute(.local.bash, "udevtrigger --subsystem-match=net"); - WFM::Execute (.local.bash, sformat ( - "mkdir -p '%2%1'; /bin/cp -p %1/70-persistent-net.rules '%2%1'", - "/etc/udev/rules.d", - String::Quote (Installation::destdir))); + string udev_rules_srcdir = "/etc/udev/rules.d"; + string udev_rules_srcfile = "70-persistent-net.rules"; + string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); + + //Do not create udev_rules_destdir if it already exists (in case of update) + //(bug #293366, c#7) + if (! FileUtils::Exists( udev_rules_destdir )) + WFM::Execute (.local.bash, sformat ( + "mkdir -p '%1'; /bin/cp -p '%2/%3' '%1'", + udev_rules_destdir, + udev_rules_srcdir, udev_rules_srcfile); // close and chroot back WFM::SCRClose (new_SCR); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org