Self-update control file (#839)

* Update control file during self-update * Bump version and update changes file
yast · Feb 20, 2020 · b89ffa3 · b89ffa3
1 parent d8a4a38
commit b89ffa3
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 20 11:24:41 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Allow to modify the control file at installation time using a
+  skelcd-* package (bsc#1164468).
+- 4.2.33
+
 -------------------------------------------------------------------
 Wed Feb 19 09:40:45 UTC 2020 - Steffen Winterfeldt <snwint@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.2.32
+Version:        4.2.33
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only

diff --git a/src/lib/installation/updates_manager.rb b/src/lib/installation/updates_manager.rb
@@ -16,6 +16,7 @@
 require "pathname"
 require "installation/driver_update"
 require "installation/update_repository"
+require "yast2/execute"
 
 module Installation
   # This class takes care of managing installer updates
@@ -110,14 +111,27 @@ def add_repository(uri)
     # @see Installation::UpdateRepository#apply
     # @see Installation::DriverUpdate#apply
     # @see #repositories
+    # @raise CouldNotUpdateControlFile
     def apply_all
       (repositories + driver_updates).each(&:apply)
       repositories.each(&:cleanup)
+      replace_control_file
     end
 
     # Determines whether the manager has repositories with updates
     def repositories?
       !repositories.empty?
     end
+
+  private
+
+    NEW_CONTROL_FILE_PATH = "/usr/lib/skelcd/CD1/control.xml".freeze
+
+    # Replaces the control file with the updated one (if it exists)
+    def replace_control_file
+      return unless File.exist?(NEW_CONTROL_FILE_PATH)
+      log.info("Updating control.xml file in inst-sys")
+      Yast::Execute.locally!("/sbin/adddir", File.dirname(NEW_CONTROL_FILE_PATH), "/")
+    end
   end
 end
diff --git a/test/updates_manager_test.rb b/test/updates_manager_test.rb
@@ -102,8 +102,12 @@
   end
 
   describe "#apply_all" do
+    let(:new_control_file?) { false }
+
     before do
       allow(manager).to receive(:repositories).and_return([repo0, repo1])
+      allow(File).to receive(:exist?).with("/usr/lib/skelcd/CD1/control.xml")
+        .and_return(new_control_file?)
     end
 
     it "applies all the updates" do
@@ -124,6 +128,22 @@
         manager.apply_all
       end
     end
+
+    context "when a new control file is available" do
+      let(:new_control_file?) { true }
+
+      it "updates the control file" do
+        expect(Yast::Execute).to receive(:locally!)
+          .with("/sbin/adddir", "/usr/lib/skelcd/CD1", "/")
+        manager.apply_all
+      end
+    end
+
+    it "does not replace the control file" do
+      expect(Yast::Execute).to_not receive(:locally!)
+        .with("/sbin/adddir", /skelcd/, "/")
+      manager.apply_all
+    end
   end
 
   describe "#repositories?" do