Author: jsrain Date: Fri Oct 30 13:52:48 2009 New Revision: 59255 URL: http://svn.opensuse.org/viewcvs/yast?rev=59255&view=rev Log: call correct_live_for_reboot script before reboot (bnc#550874) Modified: branches/SuSE-Linux-11_2-Branch/live-installer/VERSION branches/SuSE-Linux-11_2-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Linux-11_2-Branch/live-installer/src/live_save_config_finish.ycp Modified: branches/SuSE-Linux-11_2-Branch/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/live-installer/VERSION?rev=59255&r1=59254&r2=59255&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/live-installer/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/live-installer/VERSION Fri Oct 30 13:52:48 2009 @@ -1 +1 @@ -2.18.7 +2.18.8 Modified: branches/SuSE-Linux-11_2-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/live-installer/package/yast2-live-installer.changes?rev=59255&r1=59254&r2=59255&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Linux-11_2-Branch/live-installer/package/yast2-live-installer.changes Fri Oct 30 13:52:48 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 13:46:38 CET 2009 - jsrain@suse.cz + +- call correct_live_for_reboot script before reboot (bnc#550874) +- 2.18.8 + +------------------------------------------------------------------- Wed Sep 9 14:54:15 CEST 2009 - jsrain@suse.cz - enhanced error reporting (bnc#533601) Modified: branches/SuSE-Linux-11_2-Branch/live-installer/src/live_save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/live-installer/src/live_save_config_finish.ycp?rev=59255&r1=59254&r2=59255&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/live-installer/src/live_save_config_finish.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/live-installer/src/live_save_config_finish.ycp Fri Oct 30 13:52:48 2009 @@ -21,6 +21,7 @@ import "Keyboard"; import "Installation"; import "Language"; +import "FileUtils"; any ret = nil; string func = ""; @@ -60,6 +61,23 @@ Progress::Title (_("Saving time zone...")); Timezone::Save(); + // bnc#550874 + // Call a script if it exists + string scriptname = "/usr/bin/correct_live_for_reboot"; + if (FileUtils::Exists (scriptname)) { + y2milestone ("Calling %1 returned %2", + scriptname, + SCR::Execute (.target.bash_output, scriptname) + ); + y2milestone ("Removing %1 returned %2", + scriptname, + SCR::Execute (.target.bash_output, sformat ("/bin/rm %1", scriptname)) + ); + } else { + y2milestone ("Script %1 doesn't exist, skipping...", scriptname); + } + + } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org