Author: juhliarik Date: Tue Apr 28 16:50:01 2009 New Revision: 57011

URL: http://svn.opensuse.org/viewcvs/yast?rev=57011&view=rev Log: synchronize with SLE11

Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/clients/bootloader_finish.ycp

Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootload... ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Apr 28 16:50:01 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 28 16:48:12 CEST 2009 - juhliarik@suse.cz + +- added updated patch from IBM and reipl (bnc#471522) + +------------------------------------------------------------------- Tue Apr 28 16:37:43 CEST 2009 - juhliarik@suse.cz

- disable checking thinkpad sequence in MBR also save content of

Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader... ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Tue Apr 28 16:50:01 2009 @@ -93,9 +93,9 @@ // where we do a hard reboot. However, the cdrom is still mounted here // and cant be removed.

+ map finish_ret = nil; if (Arch::s390 ()) { - map finish_ret = nil; string reipl_client = "reipl_bootloader_finish";

// Calling a special reIPL client @@ -103,15 +103,24 @@

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 = ""; - if (finish_ret["different"]:false == true) { - ipl_msg = finish_ret["ipl_msg"]:""; - } + ipl_msg = finish_ret["ipl_msg"]:"";

// SSH modification string usessh_msg = "";