Author: juhliarik Date: Tue Feb 9 16:03:55 2010 New Revision: 60771 URL: http://svn.opensuse.org/viewcvs/yast?rev=60771&view=rev Log: added fix for deleting custom boot partition bnc#544809 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/grub/options.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=60771&r1=60770&r2=60771&view=diff ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Tue Feb 9 16:03:55 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=60771&r1=60770&r2=60771&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Feb 9 16:03:55 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 9 16:03:31 CET 2010 - juhliarik@suse.cz + +- added fix for deleting Custom Boot Partition (bnc#544809) +- 2.19.2 + +------------------------------------------------------------------- Thu Jan 28 16:08:30 CET 2010 - juhliarik@suse.cz - added commnets for using options in /etc/sysconfig/bootloader Modified: trunk/bootloader/src/grub/options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/options.ycp?rev=60771&r1=60770&r2=60771&view=diff ============================================================================== --- trunk/bootloader/src/grub/options.ycp (original) +++ trunk/bootloader/src/grub/options.ycp Tue Feb 9 16:03:55 2010 @@ -505,7 +505,7 @@ UI::ChangeWidget (`id ("boot_extended"), `Enabled, false); } - if ((!haskey(BootCommon::globals,"boot_custom")) && + if ((!haskey(BootCommon::globals,"boot_custom")) || (BootCommon::globals["boot_custom"]:"" == "")) { UI::ChangeWidget (`id ("boot_custom_list"),`Enabled, false); @@ -555,6 +555,9 @@ } if ((boolean)UI::QueryWidget(`id("boot_custom"), `Value)) BootCommon::globals["boot_custom"]= (string)UI::QueryWidget(`id("boot_custom_list"), `Value); + //bnc#544809 Custom Boot Partition cannot be deleted + else + BootCommon::globals["boot_custom"]=""; } /** FIXME: merge help text to one for BootLoaderLocationWidget -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org