Author: juhliarik Date: Mon Jan 28 17:01:12 2008 New Revision: 43956 URL: http://svn.opensuse.org/viewcvs/yast?rev=43956&view=rev Log: - added bugfix for bug#305968 - OES2 upgrade installs the XEN menu item in menu.lst by default Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootloa... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp Mon Jan 28 17:01:12 2008 @@ -827,7 +827,7 @@ string label = s["name"]:""; // do not touch the wildcard section - if (regexpmatch (s["kernel"]:"", ".+\\-\\*")) + if (regexpmatch ((haskey(s, "kernel") ? (s["kernel"]:""):(s["image"]:"")), ".+\\-\\*")) { if (first == nil) first = label; @@ -849,7 +849,12 @@ first = label; return true; } - string kernel = s["kernel"]:""; + string kernel =""; + if (haskey(s, "kernel")) + kernel = s["kernel"]:""; + else + kernel = s["image"]:""; + if (kernel == "") { if (first == nil) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org