[yast-commit] r49690 - in /trunk/installation: package/yast2-installation.changes src/clients/switch_scr_finish.ycp src/clients/yast_inf_finish.ycp src/include/scr_switch_debugger.ycp

Author: locilka Date: Tue Aug 5 12:30:00 2008 New Revision: 49690 URL: http://svn.opensuse.org/viewcvs/yast?rev=49690&view=rev Log: - Running SCR Switch Debugger unconditionally if switching to installed system fails (bnc #411832). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/switch_scr_finish.ycp trunk/installation/src/clients/yast_inf_finish.ycp trunk/installation/src/include/scr_switch_debugger.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=49690&r1=49689&r2=49690&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Aug 5 12:30:00 2008 @@ -3,6 +3,8 @@ - Calling reiplauto client in SLES control file before reboot (FATE #304940). +- Running SCR Switch Debugger unconditionally if switching to + installed system fails (bnc #411832). ------------------------------------------------------------------- Mon Aug 04 16:22:55 CEST 2008 - aschnell@suse.de Modified: trunk/installation/src/clients/switch_scr_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/switch_scr_finish.ycp?rev=49690&r1=49689&r2=49690&view=diff ============================================================================== --- trunk/installation/src/clients/switch_scr_finish.ycp (original) +++ trunk/installation/src/clients/switch_scr_finish.ycp Tue Aug 5 12:30:00 2008 @@ -27,29 +27,13 @@ /** * SCR Switch failed. Reporting error, collecting data. - * bugzilla #201058 + * We don't ask whether to run the debugger, just run it. + * + * bnc #201058, #411832 */ void ErrorDuringSCRSwitch (string chroot_dir) { - // import the library once it is needed - import "Popup"; - - y2error("Cannot switch to SCR '%1'", chroot_dir); - - // Ask users whether they want to debug the problem - if (Popup::YesNoHeadline ( - // popup error headline - _("Installation Error"), - // popup question - _("An error occurred while switching to the installed system -and no recovery is possible. -Run the automatic debugger to find out why it has failed?") - )) { - y2milestone("User decided to debug the current problem"); - - RunSCRSwitchDebugger(chroot_dir); - } else { - y2warning("User decided not to debug the current problem"); - } + y2error("Cannot switch to SCR '%1', running debugger", chroot_dir); + RunSCRSwitchDebugger(chroot_dir); } /* Check arguments */ Modified: trunk/installation/src/clients/yast_inf_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/yast_inf_finish.ycp?rev=49690&r1=49689&r2=49690&view=diff ============================================================================== --- trunk/installation/src/clients/yast_inf_finish.ycp (original) +++ trunk/installation/src/clients/yast_inf_finish.ycp Tue Aug 5 12:30:00 2008 @@ -24,6 +24,10 @@ import "Keyboard"; import "Directory"; import "String"; +/* +import "Arch"; +import "Reipl"; +*/ include "installation/misc.ycp"; @@ -193,19 +197,53 @@ y2milestone ("Printing message about loading kernel via kexec"); SCR::Write (.dev.tty.stderr, _(" -*********************************************************** +************************************************************** Loading installed kernel using kexec. Trying to load installed kernel via kexec instead of rebooting Please, wait. -*********************************************************** +************************************************************** ") ); } } +/* + // FATE #304940: Change YaST2-Module for s390 Disk adaptors from + // hwconfig scheme to udev-scheme + if (Arch::s390 ()) { + boolean different = true; + map oldConfiguration = Reipl::ReadState (); + map newConfiguration = Reipl::ReadState (); + + if (oldConfiguration != nil) { + y2milestone ("Calling Reipl::ModifyReiplWithBootPartition"); + Reipl::ModifyReiplWithBootPartition (newConfiguration); + + map oldCcwMap = (map)oldConfiguration["ccw"]:nil; + map newCcwMap = (map)newConfiguration["ccw"]:nil; + map oldFcpMap = (map)oldConfiguration["fcp"]:nil; + map newFcpMap = (map)newConfiguration["fcp"]:nil; + + different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" + && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" + && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" + && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" + && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" + && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" + && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" + && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; + } + + y2milestone ("Reipl changed: %1", different); + if (different) { + linuxrc["Root"] = "halt"; + } + } +*/ + linuxrc["Language"] = Language::language; linuxrc["Keytable"] = Keyboard::keymap; Modified: trunk/installation/src/include/scr_switch_debugger.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/scr_switch_debugger.ycp?rev=49690&r1=49689&r2=49690&view=diff ============================================================================== --- trunk/installation/src/include/scr_switch_debugger.ycp (original) +++ trunk/installation/src/include/scr_switch_debugger.ycp Tue Aug 5 12:30:00 2008 @@ -82,18 +82,24 @@ // UI dialog term SCRSwitchDialog () { - return `MarginBox ( - 1, 1, `VBox ( - `MinWidth (70, - // used for progress - `LogView ( - `id (`log_view), - // log-view label - _("&Checking the Installed System..."), - 18, 500 - ) - ), - `ReplacePoint(`id(`dialog_rp), `Empty()) + return `VBox ( + // heading + `Heading (_("Switching to the Installed System Failed")), + // informative text + `Label (_("Running the debugger...")), + `MarginBox ( + 1, 1, `VBox ( + `MinWidth (70, + // used for progress + `LogView ( + `id (`log_view), + // log-view label + _("&Checking the Installed System..."), + 18, 500 + ) + ), + `ReplacePoint(`id(`dialog_rp), `Empty()) + ) ) ); } @@ -109,6 +115,21 @@ UI::ChangeWidget (`id(`log_view), `LastLine, sformat ("%1 %2\n", test_description, (test_result ? result_ok : result_failed)) ); + + UI::ChangeWidget ( + `id(`log_view), `LastLine, + "\n" + + sformat ( + // TRANSLATORS: an error message + // %1 - link to our bugzilla + // %2 - directory where YaST logs are stored + _("This is worth reporting a bug at %1. +Please, attach also all YaST logs stored in the '%2' directory."), + "http://bugzilla.novell.com/", + "/var/log/YaST2/" + ) + + "\n" + ); } // report just some progress -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org