- use either on or off but not auto for secure boot setting (bnc #812…

…008) - 2.17.96
yast · May 22, 2013 · 1214d9d · 1214d9d
1 parent fee1b91
commit 1214d9d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.95
+2.17.96
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 22 15:30:25 CEST 2013 - snwint@suse.de
+
+- use either on or off but not auto for secure boot setting (bnc #812008)
+- 2.17.96
+
 -------------------------------------------------------------------
 Fri Mar 15 11:15:54 CET 2013 - snwint@suse.de
 

diff --git a/src/modules/BootELILO.ycp b/src/modules/BootELILO.ycp
@@ -189,7 +189,6 @@ global void CreateGlobals () {
     //	"default" : BootCommon::translateSectionTitle ("linux"),
 	"default" : "linux",
 	"timeout" : "80",
-	"secure-boot" : "auto",
 	"prompt" : "true",
     // bnc #438276 - remove deprecated 'read-only'
     //	"read-only" : "true",
@@ -252,10 +251,6 @@ global define boolean Read (boolean reread, boolean avoid_reading_device_map) {
 	BootCommon::DetectDisks ();
 	boolean ret = BootCommon::Read (reread, avoid_reading_device_map);
 
-	if (BootCommon::globals["secure-boot"]:"" == "") {
-	  BootCommon::globals["secure-boot"] = "auto";
-	}
-
 	// check for meaningless EFI entry name in sysconfig
 	if ( !haskey(BootCommon::globals,"boot_efilabel")
 	    || BootCommon::globals["boot_efilabel"]:"" == "mbr"