Author: juhliarik Date: Wed Mar 11 10:13:53 2009 New Revision: 56063 URL: http://svn.opensuse.org/viewcvs/yast?rev=56063&view=rev Log: updated handling of GRUB UI Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/misc.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/widgets_i386.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/misc.ycp?rev=56063&r1=56062&r2=56063&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/misc.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/misc.ycp Wed Mar 11 10:13:53 2009 @@ -449,7 +449,6 @@ if (haskey (BootCommon::globals, "boot_custom")) { BootCommon::globals = remove (BootCommon::globals, "boot_custom"); } - BootCommon::change_widget_default_value("boot_custom", ""); // FIXME: kludge, may be obsolete if ( selected_location == `root ) { BootCommon::globals["boot_root"] = sformat("%1", true); @@ -459,11 +458,6 @@ BootCommon::globals["boot_mbr"] = sformat("%1", true); } else if ( selected_location == `extended ) { BootCommon::globals["boot_extended"] = sformat("%1", true); -// FIXME: `mbr_md is probably unneeded; AFA we can see, this decision is -// automatic anyway and perl-Bootloader should be able to make it without help -// from the user or the proposal. -// } else if ( selected_location == `mbr_md ) { -// BootCommon::globals["boot_mbr_md"] = sformat("%1", true); } } @@ -858,17 +852,6 @@ " any more.\n" ]; -// FIXME: `mbr_md is probably unneeded; AFA we can see, this decision is -// automatic anyway and perl-Bootloader should be able to make it without help -// from the user or the proposal. -// if ( BootCommon::globals["boot_mbr_md"]:"false" == "true" ) { -// // FIXME: handle Md2Partitions() etc. here -// map p_dev = Storage::GetDiskPartition (BootCommon::BootPartitionDevice); -// string actual_mbr = p_dev["disk"]:""; -// -// if ( actual_mbr != BootCommon::mbrDisk ) -// ret = true; // FIXME: use new return structure -// } if ( BootCommon::globals["boot_custom"]:nil != nil ) { list all_boot_partitions = BootCommon::getPartitionList(`boot); Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp?rev=56063&r1=56062&r2=56063&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp Wed Mar 11 10:13:53 2009 @@ -812,6 +812,8 @@ if ((v["type"]:`CT_UNKNOWN == `CT_DISK) || (v["type"]:`CT_UNKNOWN == `CT_DMRAID)) return true; + else + return false; }); } list<string> all_disks = (list<string>) maplist (string k, map v, devices, @@ -841,6 +843,8 @@ all_disks = (list<string>) filter(string k, all_disks, { if (haskey(device_mapping, k) || (haskey(device_mapping, Dev2MountByDev(k)))) return true; + else + return false; }); list<string> ret = all_disks; if (type == `boot_other || type == `root || type == `parts_old Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/widgets_i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/widgets_i386.ycp?rev=56063&r1=56062&r2=56063&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/widgets_i386.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/widgets_i386.ycp Wed Mar 11 10:13:53 2009 @@ -304,7 +304,6 @@ * @param widget string widget key */ void InitBootLoaderLocationWidget(string widget) { - y2error("FIXME: InitBootLoaderLocationWidget() fix devices in combobox"); list<string> boot_devices = BootCommon::getPartitionList(`boot); list <string> list_global_target_keys = ["boot_mbr", "boot_boot", "boot_root", "boot_extended"]; foreach(string key, list_global_target_keys, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org