![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2-bootloader checked in at Mon Apr 28 16:30:03 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-04-22 15:05:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-04-28 14:25:29.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 28 14:16:26 CEST 2008 - juhliarik@suse.cz + +- added fix for bnc# 232424 - problem with propose new config. +- 2.16.14 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.16.13.tar.bz2 New: ---- yast2-bootloader-2.16.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.x20293/_old 2008-04-28 16:29:18.000000000 +0200 +++ /var/tmp/diff_new_pack.x20293/_new 2008-04-28 16:29:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.16.13) +# spec file for package yast2-bootloader (Version 2.16.14) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-bootloader -Version: 2.16.13 +Version: 2.16.14 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.16.13.tar.bz2 +Source0: yast2-bootloader-2.16.14.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -54,7 +54,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.16.13 +%setup -n yast2-bootloader-2.16.14 %build %{prefix}/bin/y2tool y2autoconf @@ -99,6 +99,9 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Mon Apr 28 2008 juhliarik@suse.cz +- added fix for bnc# 232424 - problem with propose new config. +- 2.16.14 * Tue Apr 22 2008 juhliarik@suse.cz - added fix for bnc# 363254 - added fix for UI problem with ComboBoxes and "Browse..." button ++++++ yast2-bootloader-2.16.13.tar.bz2 -> yast2-bootloader-2.16.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.13/src/modules/BootCommon.ycp new/yast2-bootloader-2.16.14/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.16.13/src/modules/BootCommon.ycp 2008-04-11 15:51:06.000000000 +0200 +++ new/yast2-bootloader-2.16.14/src/modules/BootCommon.ycp 2008-04-28 14:15:57.000000000 +0200 @@ -15,7 +15,7 @@ * Joachim Plack <jplack@suse.de> * Olaf Dabrunz <od@suse.de> * - * $Id: BootCommon.ycp 46420 2008-04-11 13:53:31Z juhliarik $ + * $Id: BootCommon.ycp 47102 2008-04-28 12:14:49Z juhliarik $ * */ @@ -482,7 +482,7 @@ // Then, get the file names in the "selected" kernel package, string kernel_package = Kernel::ComputePackage(); - list<string> files = Pkg::PkgGetFilelist( kernel_package, `any ); + list<string> files = Pkg::PkgGetFilelist( kernel_package, `installed ); y2milestone ("kernel package %1 has these files: %2", kernel_package, files); // then find the first file that matches the arch-dependent kernel file @@ -494,6 +494,7 @@ return ( substring(file, 0, size(kernel_prefix)) == kernel_prefix ); }); + // Sort the filtered files, thus the image strings by length, the big ones // at the beginning, the small ones at the end of the list. // So, the first element of the sorted list files_filtered is the image string @@ -523,6 +524,45 @@ "/boot/initrd-*" : files_filtered[0]:"" ); + + if ((kernel_fn == "") || (kernel_fn == nil)) + kernel_fn = "/boot/vmlinuz"; + + if ((initrd_fn == "") || (initrd_fn == nil)) + initrd_fn = "/boot/initrd"; + + // read commandline options for kernel + list<string> cmd = (list<string>) SCR::Read(.proc.cmdline); + + any vga = nil; + + // trying to find "vga" option + foreach ( string key, cmd, + { + if (find(key, "vga=") != -1) + vga = key; + y2milestone("key: %1", key); + }); + y2milestone("vga from command line: %1", vga); + list <string> mode =[]; + + // split vga=value + if ((vga != nil) && (vga != "")) + mode = splitstring(tostring(vga), "="); + + string vgamode =nil; + + // take value if exist + if ((size(mode)>1) && (mode[0]:"" == "vga")) + vgamode = mode[1]:nil; + + // add value of vga into proposal (if exist) + if ((vgamode != nil) && (vgamode != "")) + { + ret["vga"] = vgamode; + y2milestone("vga mode: %1", vgamode); + } + } else { // the links are shown in the proposal; at the end of an installation, // in bootloader_finish, they will be resolved to the real filenames @@ -545,12 +585,13 @@ if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") { -//B#352020 kokso: - Graphical failsafe mode + // B#352020 kokso: - Graphical failsafe mode //if (title == "failsafe") // ret["vga"] = "normal"; //else ret["vga"] = Kernel::GetVgaType (); -//B#352020 end + + // B#352020 end } if (title == "xen") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.13/VERSION new/yast2-bootloader-2.16.14/VERSION --- old/yast2-bootloader-2.16.13/VERSION 2008-04-18 16:51:40.000000000 +0200 +++ new/yast2-bootloader-2.16.14/VERSION 2008-04-22 16:54:56.000000000 +0200 @@ -1 +1 @@ -2.16.13 +2.16.14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org