Skip to content

Commit

Permalink
Make GRUB_DISTRIBUTOR with product version
Browse files Browse the repository at this point in the history
First the Product::name returns version on running systems but not on
the installation system. We have to ensure that the version is specified
to GRUB_DISTRIBUTOR anyway.

Without the version, EFI boot menu would be added as "openSUSE" for all
versions and reference same bootloader path. This casues problem on
multiple version installation.

This fixes EFI boot menu entry cannot be chosen and multiple openSUSE
installations will overwrite it (bnc#796514).
  • Loading branch information
WenhuaChang committed Jan 9, 2013
1 parent 0088001 commit ac25555
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/modules/BootGRUB2.ycp
Expand Up @@ -162,7 +162,7 @@ global define void Propose () {
resume = BootStorage::Dev2MountByDev(resume);
BootCommon::globals["append"] = BootArch::DefaultKernelParams (resume);
BootCommon::globals["append_failsafe"] = BootArch::FailsafeKernelParams ();
BootCommon::globals["distributor"] = Product::name;
BootCommon::globals["distributor"] = Product::short_name + " " + Product::version;
BootCommon::kernelCmdLine = Kernel::GetCmdLine ();

// Let grub2 scripts detects correct root= for us. :)
Expand Down
2 changes: 1 addition & 1 deletion src/modules/BootGRUB2EFI.ycp
Expand Up @@ -155,7 +155,7 @@ global define void Propose () {
resume = BootStorage::Dev2MountByDev(resume);
BootCommon::globals["append"] = BootArch::DefaultKernelParams (resume);
BootCommon::globals["append_failsafe"] = BootArch::FailsafeKernelParams ();
BootCommon::globals["distributor"] = Product::name;
BootCommon::globals["distributor"] = Product::short_name + " " + Product::version;
BootCommon::kernelCmdLine = Kernel::GetCmdLine ();

// Let grub2 scripts detects correct root= for us. :)
Expand Down

0 comments on commit ac25555

Please sign in to comment.