Merge remote-tracking branch 'origin/SLE-12-GA' into merge_sle12_fix_…

…test Conflicts: package/yast2-bootloader.changes package/yast2-bootloader.spec
yast · Oct 8, 2014 · 3d796d3 · 3d796d3
2 parents 9a33a98 + 03559e2
commit 3d796d3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct  7 09:08:07 UTC 2014 - jreidinger@suse.com
+
+- keep user selection for password (bnc#900026)
+- fix build on ppc
+- 3.1.101
+
 -------------------------------------------------------------------
 Tue Sep 30 09:30:52 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.100
+Version:        3.1.101
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/bootloader/grub2/options.rb b/src/include/bootloader/grub2/options.rb
@@ -327,20 +327,14 @@ def grub2_pwd_store(key, event)
     end
 
     def grub2_pwd_init(widget)
-      passwd = GRUB2Pwd.new.used?
-      if passwd
-        UI.ChangeWidget(Id(:use_pas), :Value, true)
-        UI.ChangeWidget(Id(:pw1), :Enabled, true)
-        UI.ChangeWidget(Id(:pw1), :Value, MASKED_PASSWORD)
-        UI.ChangeWidget(Id(:pw2), :Enabled, true)
-        UI.ChangeWidget(Id(:pw2), :Value, MASKED_PASSWORD)
-      else
-        UI.ChangeWidget(Id(:use_pas), :Value, false)
-        UI.ChangeWidget(Id(:pw1), :Enabled, false)
-        UI.ChangeWidget(Id(:pw1), :Value, "")
-        UI.ChangeWidget(Id(:pw2), :Enabled, false)
-        UI.ChangeWidget(Id(:pw2), :Value, "")
-      end
+      # read state on disk only if not already set by user (bnc#900026)
+      password_used = password == "" ? GRUB2Pwd.new.used? : password
+      value = password_used ? MASKED_PASSWORD : ""
+      UI.ChangeWidget(Id(:use_pas), :Value, password_used)
+      UI.ChangeWidget(Id(:pw1), :Enabled, password_used)
+      UI.ChangeWidget(Id(:pw1), :Value, value)
+      UI.ChangeWidget(Id(:pw2), :Enabled, password_used)
+      UI.ChangeWidget(Id(:pw2), :Value, value)
     end
 
     def Grub2Options