Author: odabrunz Date: Tue Jul 10 22:25:52 2007 New Revision: 39302 URL: http://svn.opensuse.org/viewcvs/yast?rev=39302&view=rev Log: - always log the target map when Propose() is called (not only when we debug) - convert custom boot device names to the names indicated by the mountby setting; this is one part of a change to use persistent device names for the bootloader boot device, the rest requires simultaneously changing perl-Bootloader because of an incompatible interface change (#248162) - #214468: - fixed autoyast schema - fixed import of autoyast data: do not remove the "default" option Modified: trunk/bootloader/src/config/bootloader.rnc trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/autoinstall.ycp Modified: trunk/bootloader/src/config/bootloader.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/config/bootloader.rnc?rev=39302&r1=39301&r2=39302&view=diff ============================================================================== --- trunk/bootloader/src/config/bootloader.rnc (original) +++ trunk/bootloader/src/config/bootloader.rnc Tue Jul 10 22:25:52 2007 @@ -46,6 +46,7 @@ lines_cache_id? & bl_timeout? & gfxmenu? & + element default { text }? & bl_activate? & boot_root? & boot_boot? & Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=39302&r1=39301&r2=39302&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Tue Jul 10 22:25:52 2007 @@ -673,9 +673,24 @@ return s; }); + map my_globals = globals; + + // FIXME: give mountby information to perl-Bootloader (or define some + // better interface), so that perl-Bootloader can use mountby device names + // for these devices instead. Tracked in bug #248162. + + // convert custom boot device names in globals to the device names + // indicated by "mountby" + my_globals = mapmap (string k , string v, my_globals, { + if ( regexpmatch(k, "^boot_.*custom$" ) ) + return $[k : BootCommon::Dev2MountByDev(v)]; + else + return $[k : v]; + }); + ret = ret && SetDeviceMap (device_mapping); ret = ret && SetSections (sects); - ret = ret && SetGlobal (globals); + ret = ret && SetGlobal (my_globals); if (flush) { ret = ret && CommitSettings (); Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader.ycp?rev=39302&r1=39301&r2=39302&view=diff ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Tue Jul 10 22:25:52 2007 @@ -247,8 +247,8 @@ */ global define void Propose () { y2milestone ("Proposing configuration"); - // have a current target map available in the log when we debug - y2debug ("Unfiltered target map: %1", (map)Storage::GetTargetMap()); + // always have a current target map available in the log + y2milestone ("unfiltered target map: %1", (map)Storage::GetTargetMap()); BootCommon::UpdateInstallationKernelParameters (); blPropose (); BootCommon::was_proposed = true; Modified: trunk/bootloader/src/routines/autoinstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/autoinstall.ycp?rev=39302&r1=39301&r2=39302&view=diff ============================================================================== --- trunk/bootloader/src/routines/autoinstall.ycp (original) +++ trunk/bootloader/src/routines/autoinstall.ycp Tue Jul 10 22:25:52 2007 @@ -196,6 +196,9 @@ ai["sections"]:[]; sect = UpdateImportedSections (sect); exp["specific", "sections"] = sect; + section_names = maplist (map s, sect, { + return s["name"]:""; + }); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org