Author: locilka Date: Fri Sep 21 16:39:39 2007 New Revision: 41030 URL: http://svn.opensuse.org/viewcvs/yast?rev=41030&view=rev Log: - Start dhcpcd using WFM instead of SCR. - Kill dhcpcd at the end of the installation (both #326342). - 2.15.53 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_network_setup.ycp trunk/installation/src/clients/umount_finish.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=41030&r1... ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Sep 21 16:39:39 2007 @@ -1 +1 @@ -2.15.52 +2.15.53 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-instal... ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Sep 21 16:39:39 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Sep 21 16:35:18 CEST 2007 - locilka@suse.cz + +- Start dhcpcd using WFM instead of SCR. +- Kill dhcpcd at the end of the installation (both #326342). +- 2.15.53 + +------------------------------------------------------------------- Fri Sep 21 09:53:37 CEST 2007 - locilka@suse.cz - When normal umount at the end of the installation fails, try Modified: trunk/installation/src/clients/inst_network_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_net... ============================================================================== --- trunk/installation/src/clients/inst_network_setup.ycp (original) +++ trunk/installation/src/clients/inst_network_setup.ycp Fri Sep 21 16:39:39 2007 @@ -754,7 +754,7 @@ FlushAllIPSettings(); string cmd = sformat ("/sbin/dhcpcd '%1'", String::Quote (network_settings["network_device"]:"")); - map run_cmd = (map) SCR::Execute (.target.bash_output, cmd); + map run_cmd = (map) WFM::Execute (.local.bash_output, cmd); y2milestone ("Running %1 returned %2", cmd, run_cmd); if (run_cmd["exit"]:-1 != 0) { Modified: trunk/installation/src/clients/umount_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/umount_f... ============================================================================== --- trunk/installation/src/clients/umount_finish.ycp (original) +++ trunk/installation/src/clients/umount_finish.ycp Fri Sep 21 16:39:39 2007 @@ -127,6 +127,8 @@ // fallback // bugzilla #326478 if (umount_status != true) { + WFM::Execute (.local.bash_output, "killall dhcpcd"); + y2warning ("Umount failed, trying to remount read only..."); string cmd = sformat ("mount -o remount,ro '%1'; umount --force '%1';", String::Quote (tmp)); y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org