Author: jsrain Date: Tue Mar 8 13:43:58 2011 New Revision: 63530 URL: http://svn.opensuse.org/viewcvs/yast?rev=63530&view=rev Log: don't eject the CD during reboot after live installation (bnc#511210) Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/live-installer.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-live-installer.changes?rev=63530&r1=63529&r2=63530&view=diff ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Tue Mar 8 13:43:58 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 8 13:42:24 CET 2011 - jsrain@suse.cz + +- don't eject the CD during reboot after live installation + (bnc#511210) + +------------------------------------------------------------------- Thu Nov 18 13:12:37 UTC 2010 - jsrain@suse.cz - suppress memory warning if live installer is running directly Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installer.ycp?rev=63530&r1=63529&r2=63530&view=diff ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Tue Mar 8 13:43:58 2011 @@ -159,23 +159,19 @@ drive to finish the installation. Either YaST can reboot now or you can reboot any time later. -Note that if the Live CD is not ejected, you can either eject +Note that the Live CD is not ejected, you can either eject it after the Live system shuts down or select \"Hard Disk\" in the boot menu of the Live CD."); // push button if (Popup::AnyQuestion(Popup::NoHeadline(), msg, _("Reboot &Now"), _("Reboot &Later"), `focus_no)) { - string device = "/dev/sr0"; - map out = (map)WFM::Execute (.local.bash_output, "cat /proc/mounts |grep '\/media\/livecd ' | cut -d ' ' -f 1"); - if (out["exit"]:-1 != 0) - y2error ("Failed to detect the device"); - else - device = out["stdout"]:""; - y2milestone ("Ejecting device %1", device); - string cmd = sformat ("echo s >/proc/sysrq-trigger ; sleep 1 ; echo u >/proc/sysrq-trigger ; eject %1; sleep 10s; echo b >/proc/sysrq-trigger", device); + string cmd = "/sbin/reboot"; UI::OpenDialog (`Label ("Rebooting the system...")); - WFM::Execute (.local.bash, cmd); - // this should never be reached + if (0 == (integer)WFM::Execute (.local.bash, cmd)) { + while (true) + sleep(10); + } + // this should never be reached in case of successful reboot UI::CloseDialog (); // error report Report::Error (_("Failed to restart the computer. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org