Author: juhliarik Date: Fri May 15 18:32:27 2009 New Revision: 57207 URL: http://svn.opensuse.org/viewcvs/yast?rev=57207&view=rev Log: added support for reipl fate#305938 Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_finish.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION?rev=57207&r1=57206&r2=57207&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION Fri May 15 18:32:27 2009 @@ -1 +1 @@ -2.13.157 +2.13.158 Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes?rev=57207&r1=57206&r2=57207&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Fri May 15 18:32:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 15 12:35:35 CEST 2009 - juhliarik@suse.cz + +- added support for reipl (FATE#305938) +- 2.13.158 + +------------------------------------------------------------------- Tue May 12 10:10:16 CEST 2009 - juhliarik@suse.cz - updating last backports Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_finish.ycp?rev=57207&r1=57206&r2=57207&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_finish.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_finish.ycp Fri May 15 18:32:27 2009 @@ -88,34 +88,55 @@ // where we do a hard reboot. However, the cdrom is still mounted here // and cant be removed. + map finish_ret = nil; if (Arch::s390 ()) { - if (Linuxrc::usessh ()) - // for s390: - // Message that will be displayed along with information - // how the boot loader was installed - Misc::boot_msg = _(" -Your system will now shut down. -After shutdown, reload the system -with the load address of your root DASD or -the load adress of your zFCP device. -Then reconnect and run the following: + string reipl_client = "reipl_bootloader_finish"; + + // Calling a special reIPL client + // it returns a result map (keys: (boolean) different, (string) ipl_msg) + + if (WFM::ClientExists (reipl_client)) { + finish_ret = (map) WFM::call (reipl_client); + y2milestone ("result of reipl_bootloader_finish [%1, %2]", finish_ret["different"]:"N/A", finish_ret["ipl_msg"]:"N/A2"); + y2milestone ("finish_ret[\"different\"]:true == true : %1", finish_ret["different"]:true == true); + if (finish_ret["different"]:false == true) { + y2milestone ("finish_ret[\"different\"] is true"); + } else { + y2milestone ("finish_ret[\"different\"] is not true (either undefined or false)"); + } + } else { + y2error ("No such client: %1", reipl_client); + } + } + + if (Arch::s390 () && finish_ret["different"]:true == true) + { + + // reIPL message + string ipl_msg = ""; + ipl_msg = finish_ret["ipl_msg"]:""; + + // SSH modification + string usessh_msg = ""; + if (Linuxrc::usessh ()) { + // TRANSLATORS: part of the reboot message + // (message ID#SSH) + usessh_msg = _("Then reconnect and run the following: /usr/lib/YaST2/startup/YaST2.ssh -For details, read the related chapter -in the documentation. -"); - else - // for s390: - // Message that will be displayed along with information - // how the boot loader was installed - Misc::boot_msg = _(" -Your system will shut down now. -After shutdown, reload the system -with the load address of your root DASD or -the load address of your zFCP device. -For details, read the related chapter -in the documentation. "); + } + + // TRANSLATORS: reboot message + // %1 is replaced with additional message from reIPL + // %2 is replaced with additional message when using SSH + // See message ID#SSH + Misc::boot_msg = sformat(_(" +Your system will now shut down.%1%2 +For details, read the related chapter +in the documentation. +"), ipl_msg, usessh_msg); + } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org