Author: juhliarik Date: Fri Apr 10 15:20:14 2009 New Revision: 56756 URL: http://svn.opensuse.org/viewcvs/yast?rev=56756&view=rev Log: added fix for validation check for name boot section Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootArch.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/routines/section_widgets.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=56756&r1=56755&r2=56756&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Apr 10 15:20:14 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 10 15:18:33 CEST 2009 - juhliarik@suse.cz + +- added fix for problem with special chars in menu.lst (bnc#456362) + +------------------------------------------------------------------- Fri Apr 10 14:15:02 CEST 2009 - juhliarik@suse.cz - added fix for troubles with help in boot menu (bnc#384768) Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.ycp?rev=56756&r1=56755&r2=56756&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Fri Apr 10 15:20:14 2009 @@ -52,7 +52,7 @@ ret = ret + features + " "; if (regexpmatch (ret, "^(.* )?splash=[[:lower:]]+( .*)?$")) ret = regexpsub (ret, "^((.* ))?splash=[[:lower:]]+(( .*)?)$", "\\1 \\3"); - ret = ret + "splash=silent quiet"; + ret = ret + "splash=silent quiet showopts"; return ret; } else if (Arch::ia64 ()) Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=56756&r1=56755&r2=56756&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Fri Apr 10 15:20:14 2009 @@ -811,7 +811,7 @@ y2milestone ("Called GRUB initializer"); BootCommon::current_bootloader_attribs = $[ "alias_keys" : [], - "update_passwd" : BootGRUB::updatePasswdBeforeSave, + "update_passwd" : System::Bootloader_API::countGRUBPassword, "propose" : true, "read" : true, "scratch" : true, Modified: trunk/bootloader/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_widgets.ycp?rev=56756&r1=56755&r2=56756&view=diff ============================================================================== --- trunk/bootloader/src/routines/section_widgets.ycp (original) +++ trunk/bootloader/src/routines/section_widgets.ycp Fri Apr 10 15:20:14 2009 @@ -32,6 +32,7 @@ import "Popup"; import "FileUtils"; + include "bootloader/routines/helps.ycp"; include "bootloader/routines/section_helps.ycp"; @@ -244,7 +245,8 @@ * @return boolean true if widget settings ok */ boolean SectionNameValidate (string widget, map event) { - //TODO check for valid section name + string bl = Bootloader::getLoaderType(); + list<string> existing = []; foreach (map s, BootCommon::sections, { existing = add (existing, s["name"]:""); @@ -260,6 +262,20 @@ usedNameErrorPopup (); return false; } + + // bnc#456362 filter out special chars like diacritics china chars etc. + if ((Mode::normal()) && (bl == "grub")) + { + string filtered_new = + filterchars (new, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 _.-"); + + if (filtered_new != new) + { + Report::Error (_("The name includes unallowable char(s)")); + return false; + } + + } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org