Author: mzugec Date: Mon Sep 24 11:01:53 2007 New Revision: 41041 URL: http://svn.opensuse.org/viewcvs/yast?rev=41041&view=rev Log: for update system don't copy network from inst_sys (#325738) 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=41041&r1=41040&r2=41041&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Sep 24 11:01:53 2007 @@ -1 +1 @@ -2.15.79 +2.15.80 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=41041&r1=41040&r2=41041&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Sep 24 11:01:53 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 24 11:01:05 CEST 2007 - mzugec@suse.cz + +- for update system don't copy network from inst_sys (#325738) +- 2.15.80 + +------------------------------------------------------------------- Fri Sep 21 16:03:44 CEST 2007 - kmachalkova@suse.cz - Remember correctly device number and device module for manually Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=41041&r1=41040&r2=41041&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Mon Sep 24 11:01:53 2007 @@ -331,6 +331,7 @@ */ void save_network(){ + y2milestone("starting save_network"); // skip from chroot integer old_SCR = WFM::SCRGetDefault (); integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); @@ -410,6 +411,8 @@ } -save_network(); +// for update system don't copy network from inst_sys (#325738) +if (!Mode::update()) save_network(); + else y2milestone("update - skip save_network"); /* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org