Merge pull request #785 from yast/reboot_scripts

package/autoyast2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 20 14:45:51 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
+
+- Fixed handling of the "final_reboot" and "final_halt" options,
+  add the custom scripts only once and avoid displaying
+  a warning popup during installation (bsc#1188356)
+- 4.3.88
+
 -------------------------------------------------------------------
 Fri Jul 16 15:27:30 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

package/autoyast2.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.3.87
+Version:        4.3.88
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

src/modules/Profile.rb

@@ -131,11 +131,9 @@ def generalCompat
             Builtins.remove(Ops.get_map(@current, "general", {}), "clock")
           )
         end
-        if Ops.get_boolean(@current, ["general", "mode", "final_halt"], false)
-          script = {
-            "filename" => "zzz_halt",
-            "source"   => "shutdown -h now"
-          }
+        if Ops.get_boolean(@current, ["general", "mode", "final_halt"], false) &&
+            !Ops.get_list(@current, ["scripts", "init-scripts"], []).include?(HALT_SCRIPT)
+
           Ops.set(@current, "scripts", {}) if !Builtins.haskey(@current, "scripts")
           if !Builtins.haskey(
             Ops.get_map(@current, "scripts", {}),
@@ -148,15 +146,13 @@ def generalCompat
             ["scripts", "init-scripts"],
             Builtins.add(
               Ops.get_list(@current, ["scripts", "init-scripts"], []),
-              script
+              HALT_SCRIPT
             )
           )
         end
-        if Ops.get_boolean(@current, ["general", "mode", "final_reboot"], false)
-          script = {
-            "filename" => "zzz_reboot",
-            "source"   => "shutdown -r now"
-          }
+        if Ops.get_boolean(@current, ["general", "mode", "final_reboot"], false) &&
+            !Ops.get_list(@current, ["scripts", "init-scripts"], []).include?(REBOOT_SCRIPT)
+
           Ops.set(@current, "scripts", {}) if !Builtins.haskey(@current, "scripts")
           if !Builtins.haskey(
             Ops.get_map(@current, "scripts", {}),
@@ -169,7 +165,7 @@ def generalCompat
             ["scripts", "init-scripts"],
             Builtins.add(
               Ops.get_list(@current, ["scripts", "init-scripts"], []),
-              script
+              REBOOT_SCRIPT
             )
           )
         end
@@ -658,6 +654,16 @@ def needed_second_stage_packages
 
   private
 
+    REBOOT_SCRIPT = {
+      "filename" => "zzz_reboot",
+      "source"   => "shutdown -r now"
+    }.freeze
+
+    HALT_SCRIPT = {
+      "filename" => "zzz_halt",
+      "source"   => "shutdown -h now"
+    }.freeze
+
     def add_autoyast_packages
       @current["software"] ||= {}
       @current["software"]["packages"] ||= []

test/profile_test.rb

@@ -28,6 +28,12 @@ def patterns_list
     items_list("patterns")
   end
 
+  def reboot_scripts
+    Yast::Profile.current["scripts"]["init-scripts"].select do |s|
+      s["filename"] == "zzz_reboot"
+    end
+  end
+
   describe "#softwareCompat" do
     before do
       Yast::Profile.current = profile
@@ -120,6 +126,37 @@ def patterns_list
     end
   end
 
+  describe "#generalCompat" do
+    before do
+      Yast::Profile.current = profile
+    end
+
+    context "when a custom reboot script is not present" do
+      let(:profile) { { "general" => { "mode" => { "final_reboot" => true } } } }
+
+      it "adds a reboot script for the 'final_reboot' flag" do
+        Yast::Profile.generalCompat
+        expect(reboot_scripts).to_not be_empty
+      end
+    end
+
+    # the first stage adds a custom script for the "final_reboot" flag,
+    # ensure the second stage does not add it again (bsc#1188356)
+    context "when a custom reboot script is present" do
+      let(:profile) do
+        { "general" => { "mode" => { "final_reboot" => true } },
+          "scripts" => { "init-scripts" => [
+            { "filename" => "zzz_reboot", "source" => "shutdown -r now" }
+          ] } }
+      end
+
+      it "does not duplicate the reboot script" do
+        Yast::Profile.generalCompat
+        expect(reboot_scripts.size).to eq(1)
+      end
+    end
+  end
+
   describe "#Import" do
     let(:profile) { {} }