Author: kmachalkova Date: Tue Sep 18 14:58:15 2007 New Revision: 40955 URL: http://svn.opensuse.org/viewcvs/yast?rev=40955&view=rev Log: - Removed all udev rules workarounds (manually removing lockfiles, tmp rules, calling udevtrigger) - just copy udev rules for net and cd to the installed system iff they don't already exist (#292375) - 2.15.77 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40955&r1=40954&r2=40955&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Sep 18 14:58:15 2007 @@ -1 +1 @@ -2.15.76 +2.15.77 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=40955&r1=40954&r2=40955&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Sep 18 14:58:15 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Sep 18 14:54:18 CEST 2007 - kmachalkova@suse.cz + +- Removed all udev rules workarounds (manually removing lockfiles, + tmp rules, calling udevtrigger) - just copy udev rules for net and + cd to the installed system iff they don't already exist (#292375) +- 2.15.77 + +------------------------------------------------------------------- Wed Sep 12 13:49:17 CEST 2007 - kmachalkova@suse.cz - Do not re-add network devices (incl. loopback) into available Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=40955&r1=40954&r2=40955&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Tue Sep 18 14:58:15 2007 @@ -319,25 +319,37 @@ "/var/lib/dhcpcd", String::Quote (Installation::destdir))); - // -------------------------------------------------------------- - // Copy udev rules for persistent names - // workaround (#292375): - // delete lock files - WFM::Execute(.local.bash, "rm -rf /dev/.udev/.lock*; rm /dev/.udev/tmp-rules*"); - // re-trigger event for net - WFM::Execute(.local.bash, "udevtrigger --subsystem-match=net"); + //Deleting lockfiles and re-triggering udev events for *net is not needed any more + //(#292375 c#18) string udev_rules_srcdir = "/etc/udev/rules.d"; - string udev_rules_srcfile = "70-persistent-net.rules"; + string net_srcfile = "70-persistent-net.rules"; + string cd_srcfile = "70-persistent-cd.rules"; + 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); + string cd_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, cd_srcfile); //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)); + { + y2milestone("%1 does not exist yet, creating it", udev_rules_destdir); + WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", 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)); + } + + if (! FileUtils::Exists( cd_destfile )) + { + y2milestone("Copying %1 to the installed system ", cd_srcfile); + WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, net_srcfile, net_destfile)); + } // 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