Merge pull request #148 from yast/secure_boot_fix

Secure boot fix
yast · Aug 27, 2014 · 1d58d60 · 1d58d60
2 parents a6cf68a + 3756fa7
commit 1d58d60
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 27 07:53:45 UTC 2014 - jreidinger@suse.com
+
+- do not reset secure boot to false at the end of installation in
+  case of incapable device (bnc#892032)
+- 3.1.91
+
 -------------------------------------------------------------------
 Tue Aug 26 11:37:17 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.90
+Version:        3.1.91
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/BootCommon.rb b/src/modules/BootCommon.rb
@@ -893,22 +893,6 @@ def setLoaderType(bootloader)
       nil
     end
 
-    def checkSecureBoot
-      ret = false
-      sbvar = "/sys/firmware/efi/vars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c/data"
-      sbvar_avail = 0 ==
-        Convert.to_integer(
-          SCR.Execute(path(".target.bash"), Ops.add("test -e ", sbvar))
-        )
-
-      if sbvar_avail
-        cmd = Builtins.sformat("test `od -An -N1 -t u1 %1` -eq 1", sbvar)
-        ret = 0 == Convert.to_integer(SCR.Execute(path(".target.bash"), cmd))
-      end
-
-      ret
-    end
-
     def getSystemSecureBootStatus(recheck)
       return @secure_boot if !recheck && @secure_boot != nil
 
@@ -923,7 +907,8 @@ def getSystemSecureBootStatus(recheck)
         end
       end
 
-      @secure_boot = checkSecureBoot
+      # propose secure boot always to true (bnc#872054), otherwise respect user choice
+      @secure_boot = true if @secure_boot.nil?
       @secure_boot
     end