Author: juhliarik Date: Thu Jul 31 10:27:01 2008 New Revision: 49533 URL: http://svn.opensuse.org/viewcvs/yast?rev=49533&view=rev Log: added support for remaping windows boot section if widnows is on the second disk fate #301994 M bootloader/src/grub/misc.ycp * added debug/log messages M bootloader/src/modules/BootGRUB.ycp * added calling function for checking windows chainloader Modified: trunk/bootloader/src/clients/inst_bootloader.ycp trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/src/clients/inst_bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/inst_bootloader.ycp?rev=49533&r1=49532&r2=49533&view=diff ============================================================================== --- trunk/bootloader/src/clients/inst_bootloader.ycp (original) +++ trunk/bootloader/src/clients/inst_bootloader.ycp Thu Jul 31 10:27:01 2008 @@ -52,7 +52,7 @@ }); } - +// FATE #302245 save kernel args etc to /etc/sysconfig/bootloader BootCommon::WriteToSysconf(true); y2milestone ("finish inst_bootloader"); Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=49533&r1=49532&r2=49533&view=diff ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Thu Jul 31 10:27:01 2008 @@ -1105,10 +1105,12 @@ foreach (integer idx, list_index, { sections[idx, "remap"] = "true"; - sections[idx, "makactive"] = "true"; + sections[idx, "makeactive"] = "true"; + y2milestone("Added remap and makeactive for section: %1", sections[idx]:$[]); }); } + y2debug("Checking sections for windows chainloader: %1", sections); return sections; } Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=49533&r1=49532&r2=49533&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Thu Jul 31 10:27:01 2008 @@ -624,9 +624,15 @@ */ global boolean Save (boolean clean, boolean init, boolean flush) { + + // check if windows is on second disk and add remap if it is necessary + // FATE #301994: Correct device mapping in case windows is installed on the second HD + BootCommon::sections = checkWidnowsSection(BootCommon::sections); + // now really save the settings boolean ret = BootCommon::Save (clean, init, flush); importMetaData(); + return ret; } Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=49533&r1=49532&r2=49533&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Thu Jul 31 10:27:01 2008 @@ -1604,7 +1604,7 @@ } -/** +/** FATE #302245 save kernel args etc to /etc/sysconfig/bootloader * Function write/update info in /etc/sysconfig/bootloader * @param booloean true if it called from inst_bootloader.ycp */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org