Merge pull request #75 from yast/no_vga_s390

No vga s390
yast · Apr 17, 2014 · f75df88 · f75df88
2 parents 9ca4938 + 0f83933
commit f75df88
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr 17 11:18:31 UTC 2014 - jreidinger@suse.com
+
+- improve logging if setting kernel paramater failed to help with
+  bnc#873996
+- remove graphic adapter configuration on s390 (bnc#874010)
+- 3.1.27
+
 -------------------------------------------------------------------
 Wed Apr 16 19:49:56 UTC 2014 - jreidinger@suse.com
 
@@ -29,7 +37,7 @@ Tue Apr 15 10:38:17 UTC 2014 - jreidinger@suse.com
 Tue Apr 15 08:33:29 UTC 2014 - mchang@suse.com
 
 - remove error if boot directory on xfs file system (bnc#864370)
-- 3.1.22 
+- 3.1.22
 
 -------------------------------------------------------------------
 Thu Apr 10 11:18:51 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.26
+Version:        3.1.27
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/bootloader/grub2/dialogs.rb b/src/include/bootloader/grub2/dialogs.rb
@@ -68,6 +68,7 @@ def boot_code_tab
     def kernel_tab
       widgets = ["vgamode", "append", "append_failsafe", "console"]
       widgets.delete("console") if Arch.s390 # there is no console on s390 (bnc#868909)
+      widgets.delete("vgamode") if Arch.s390 # there is no graphic adapter on s390 (bnc#874010)
 
        {
         "id"           => "kernel_tab",

diff --git a/src/modules/BootGRUB2EFI.rb b/src/modules/BootGRUB2EFI.rb
@@ -108,7 +108,7 @@ def BootGRUB2EFI
       elsif Arch.x86_64
         packages = ["grub2-x86_64-efi", "shim", "mokutil"]
       else
-        # do not raise exception as we call contstructor everywhere even if it doesn't make sense
+        # do not raise exception as we call constructor everywhere even if it doesn't make sense
         packages = []
       end
 

diff --git a/src/modules/Bootloader.rb b/src/modules/Bootloader.rb
@@ -1050,16 +1050,27 @@ def setKernelParam(section, key, value)
       elsif section == "LINUX_DEFAULT"
         section = getProposedDefaultSection
       end
-      return false if section == nil
+      if section.nil?
+        Builtins.y2error("section is nil, so kernel parameter cannot be set")
+        return false
+      end
+
       sectnum = -1
       index = -1
       Builtins.foreach(BootCommon.sections) do |s|
-        index = Ops.add(index, 1)
+        index += 1
         sectnum = index if Ops.get_string(s, "name", "") == section
       end
-      return false if sectnum == -1
-      slabel = ""
-      return false if (key == "vga" || key == "root") && value == "true"
+      if sectnum == -1
+        Builtins.y2error "Cannot find given section #{section} in sections #{BootCommon.sections.inspect}"
+        return false
+      end
+
+      if (key == "vga" || key == "root") && value == "true"
+        Builtins.y2error "invalid values passed as kernel param #{key.inspect} => #{value.inspect}"
+        return false
+      end
+
       if Builtins.contains(["root", "vga"], key)
         if value != "false"
           if key == "vga"
@@ -1095,8 +1106,8 @@ def setKernelParam(section, key, value)
         Ops.set(BootCommon.sections, [sectnum, "__changed"], true)
       end
       BootCommon.changed = true
-      ret = true
-      ret
+
+      return true
     end