Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package yast2-bootloader for 
openSUSE:Factory checked in at 2022-09-22 14:49:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-bootloader.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-bootloader"

Thu Sep 22 14:49:40 2022 rev:325 rq:1005329 version:4.5.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes        
2022-09-13 15:07:45.784367929 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-bootloader.new.2275/yast2-bootloader.changes  
    2022-09-22 14:49:46.558413548 +0200
@@ -1,0 +2,13 @@
+Wed Sep 21 20:42:31 UTC 2022 - Josef Reidinger <[email protected]>
+
+- write stage1 location on transactional systems (bsc#1128853)
+- 4.5.6
+
+-------------------------------------------------------------------
+Wed Sep 21 06:24:02 UTC 2022 - Michal Filka <[email protected]>
+
+- bsc#1203418
+  - added default proposal for hidden timeout
+- 4.5.5 
+
+-------------------------------------------------------------------

Old:
----
  yast2-bootloader-4.5.4.tar.bz2

New:
----
  yast2-bootloader-4.5.6.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.Q8fgvB/_old  2022-09-22 14:49:47.198415171 +0200
+++ /var/tmp/diff_new_pack.Q8fgvB/_new  2022-09-22 14:49:47.202415181 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.5.4
+Version:        4.5.6
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later

++++++ yast2-bootloader-4.5.4.tar.bz2 -> yast2-bootloader-4.5.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-bootloader-4.5.4/package/yast2-bootloader.changes 
new/yast2-bootloader-4.5.6/package/yast2-bootloader.changes
--- old/yast2-bootloader-4.5.4/package/yast2-bootloader.changes 2022-09-12 
13:10:26.000000000 +0200
+++ new/yast2-bootloader-4.5.6/package/yast2-bootloader.changes 2022-09-22 
09:38:02.000000000 +0200
@@ -1,4 +1,17 @@
 -------------------------------------------------------------------
+Wed Sep 21 20:42:31 UTC 2022 - Josef Reidinger <[email protected]>
+
+- write stage1 location on transactional systems (bsc#1128853)
+- 4.5.6
+
+-------------------------------------------------------------------
+Wed Sep 21 06:24:02 UTC 2022 - Michal Filka <[email protected]>
+
+- bsc#1203418
+  - added default proposal for hidden timeout
+- 4.5.5 
+
+-------------------------------------------------------------------
 Mon Sep 12 10:04:01 UTC 2022 - Josef Reidinger <[email protected]>
 
 - Allow bootloader to run on transactional systems (bsc#1128853)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-bootloader-4.5.4/package/yast2-bootloader.spec 
new/yast2-bootloader-4.5.6/package/yast2-bootloader.spec
--- old/yast2-bootloader-4.5.4/package/yast2-bootloader.spec    2022-09-12 
13:10:26.000000000 +0200
+++ new/yast2-bootloader-4.5.6/package/yast2-bootloader.spec    2022-09-22 
09:38:02.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.5.4
+Version:        4.5.6
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-bootloader-4.5.4/src/lib/bootloader/grub2.rb 
new/yast2-bootloader-4.5.6/src/lib/bootloader/grub2.rb
--- old/yast2-bootloader-4.5.4/src/lib/bootloader/grub2.rb      2022-09-12 
13:10:26.000000000 +0200
+++ new/yast2-bootloader-4.5.6/src/lib/bootloader/grub2.rb      2022-09-22 
09:38:02.000000000 +0200
@@ -64,12 +64,15 @@
       pmbr_setup(*::Yast::BootStorage.gpt_disks(stage1.devices))
 
       # powernv must not call grub2-install (bnc#970582)
-      if !Yast::Arch.board_powernv && !etc_only
-        failed = @grub_install.execute(
-          devices: stage1.devices, secure_boot: secure_boot, trusted_boot: 
trusted_boot,
-          update_nvram: update_nvram
-        )
-        failed.each { |f| stage1.remove_device(f) }
+      if !Yast::Arch.board_powernv
+        if !etc_only
+          failed = @grub_install.execute(
+            devices: stage1.devices, secure_boot: secure_boot, trusted_boot: 
trusted_boot,
+            update_nvram: update_nvram
+          )
+          failed.each { |f| stage1.remove_device(f) }
+        end
+        # write stage1 location
         stage1.write
       end
       # Do some mbr activations ( s390 do not have mbr nor boot flag on its 
disks )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-bootloader-4.5.4/src/lib/bootloader/grub2base.rb 
new/yast2-bootloader-4.5.6/src/lib/bootloader/grub2base.rb
--- old/yast2-bootloader-4.5.4/src/lib/bootloader/grub2base.rb  2022-09-12 
13:10:26.000000000 +0200
+++ new/yast2-bootloader-4.5.6/src/lib/bootloader/grub2base.rb  2022-09-22 
09:38:02.000000000 +0200
@@ -154,18 +154,7 @@
       propose_terminal
       propose_timeout
       propose_encrypted
-
-      if grub_default.kernel_params.empty?
-        kernel_line = Yast::BootArch.DefaultKernelParams(propose_resume)
-        grub_default.kernel_params.replace(kernel_line)
-      end
-      grub_default.gfxmode ||= "auto"
-      grub_default.recovery_entry.disable unless 
grub_default.recovery_entry.defined?
-      grub_default.distributor ||= ""
-      grub_default.default = "saved"
-      # always propose true as grub2 itself detect if btrfs used
-      grub_default.generic_set("SUSE_BTRFS_SNAPSHOT_BOOTING", "true")
-
+      propose_grub_default
       propose_serial
       propose_xen_hypervisor
 
@@ -361,6 +350,8 @@
     end
 
     def propose_timeout
+      grub_default.hidden_timeout = "0"
+
       return if grub_default.timeout
 
       grub_default.timeout = 
Yast::ProductFeatures.GetIntegerFeature("globals", "boot_timeout").to_s
@@ -412,6 +403,19 @@
       grub_default.cryptodisk.value = !!Yast::BootStorage.encrypted_boot?
     end
 
+    def propose_grub_default
+      if grub_default.kernel_params.empty?
+        kernel_line = Yast::BootArch.DefaultKernelParams(propose_resume)
+        grub_default.kernel_params.replace(kernel_line)
+      end
+      grub_default.gfxmode ||= "auto"
+      grub_default.recovery_entry.disable unless 
grub_default.recovery_entry.defined?
+      grub_default.distributor ||= ""
+      grub_default.default = "saved"
+      # always propose true as grub2 itself detect if btrfs used
+      grub_default.generic_set("SUSE_BTRFS_SNAPSHOT_BOOTING", "true")
+    end
+
     # Secure boot setting shown in summary screen.
     #
     # @return [String]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-bootloader-4.5.4/test/grub2_test.rb 
new/yast2-bootloader-4.5.6/test/grub2_test.rb
--- old/yast2-bootloader-4.5.4/test/grub2_test.rb       2022-09-12 
13:10:26.000000000 +0200
+++ new/yast2-bootloader-4.5.6/test/grub2_test.rb       2022-09-22 
09:38:02.000000000 +0200
@@ -55,16 +55,12 @@
       allow(Yast::BootStorage).to receive(:gpt_disks).and_return(["/dev/sdb"])
     end
 
-    it "writes stage1 location on non-transactional systems" do
+    it "writes stage1 location" do
       stage1 = double(Bootloader::Stage1, devices: [], generic_mbr?: false)
       expect(stage1).to receive(:write)
       allow(Bootloader::Stage1).to receive(:new).and_return(stage1)
 
       subject.write
-
-      expect(stage1).to_not receive(:write)
-
-      subject.write(etc_only: true)
     end
 
     it "changes pmbr flag as specified in pmbr_action for all boot devices 
with gpt label" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-bootloader-4.5.4/test/grub2base_test.rb 
new/yast2-bootloader-4.5.6/test/grub2base_test.rb
--- old/yast2-bootloader-4.5.4/test/grub2base_test.rb   2022-09-12 
13:10:26.000000000 +0200
+++ new/yast2-bootloader-4.5.6/test/grub2base_test.rb   2022-09-22 
09:38:02.000000000 +0200
@@ -478,6 +478,12 @@
       expect(subject.update_nvram).to eq true
     end
 
+    it "proposes hidden timeout option disabled" do
+      subject.propose
+
+      expect(subject.grub_default.hidden_timeout).to eq "0"
+    end
+
     context "with a serial console on the kernel command line on non-s390" do
       before do
         allow(Yast::Arch).to receive(:architecture).and_return("x86_64")

Reply via email to