merging enabled

yast · May 15, 2023 · 86ecf1e · 86ecf1e
1 parent 72dedf3
commit 86ecf1e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/lib/bootloader/systemdboot.rb b/src/lib/bootloader/systemdboot.rb
@@ -29,7 +29,12 @@ def initialize
 
       textdomain "bootloader"
       self.menue_timeout = Yast::ProductFeatures.GetIntegerFeature("globals", "boot_timeout").to_i
-      log.info "xxxxxxxxxxx1 #{self.menue_timeout}"
+    end
+
+    def merge(other)
+      log.info "merging with system: timeout #{other.menue_timeout}"
+      super
+      self.menue_timeout = other.menue_timeout unless other.menue_timeout.nil?
     end
 
     def cpu_mitigations
@@ -169,7 +174,6 @@ def read_menue_timeout
           end
         end
       end
-      log.info "xxxxxxxxxxx23 #{self.menue_timeout}"      
     end
 
     def write_menue_timeout
@@ -191,9 +195,7 @@ def write_menue_timeout
         File.open(filename, "w+") do |fw|
           fw.puts(output)
         end
-        log.info "xxxxxxxxxxx24 #{self.menue_timeout}"        
       end
-      log.info "xxxxxxxxxxx25 #{self.menue_timeout}"      
     end
 
     def bootloader_is_installed