Merge pull request #165 from yast/short_product

Short product
yast · Sep 25, 2014 · 70866c1 · 70866c1
2 parents b1eb7d7 + 2862d4a
commit 70866c1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 25 07:28:20 UTC 2014 - jreidinger@suse.com
+
+- use short product name to avoid truncated text on small
+  resolution (bnc#873675)
+- 3.1.94.5
+
 -------------------------------------------------------------------
 Tue Sep 23 12:15:25 UTC 2014 - jreidinger@suse.com
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.1.94.4
+Version:        3.1.94.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/bootloader/grub2base.rb b/src/lib/bootloader/grub2base.rb
@@ -128,7 +128,15 @@ def Propose
 
       BootCommon.globals["append"]          ||= BootArch.DefaultKernelParams(resume)
       BootCommon.globals["append_failsafe"] ||= BootArch.FailsafeKernelParams
-      BootCommon.globals["distributor"]     ||= Product.name
+      # long name doesn't fit 800x600 GRUB screens, using short name by default
+      # (bnc#873675)
+      BootCommon.globals["distributor"]     ||= Product.short_name
+      if !BootCommon.globals["distributor"] ||
+          BootCommon.globals["distributor"].empty?
+        BootCommon.globals["distributor"]     = Product.name
+      end
+
+
       BootCommon.kernelCmdLine              ||= Kernel.GetCmdLine
 
       # Propose bootloader serial settings from kernel cmdline during install (bnc#862388)