Merge 1ce822e into 262462d

yast · Jun 14, 2021 · 9efefbd · 9efefbd
2 parents 262462d + 1ce822e
commit 9efefbd
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 3 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 14 09:37:41 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Fix the copy of the profile to the installed system as
+  /var/adm/autoinstall/cache/installedSystem.xml (bsc#1187221).
+- 4.4.10
+
 -------------------------------------------------------------------
 Fri Jun 11 09:46:05 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.4.9
+Version:        4.4.10
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

diff --git a/src/modules/AutoInstall.rb b/src/modules/AutoInstall.rb
@@ -237,7 +237,7 @@ def Finish(destdir)
         path(".target.bash"),
         Builtins.sformat(
           "/bin/cp %1 %2%3",
-          "#{AutoinstConfig.tmpDir}/profile/autoinst.xml",
+          AutoinstConfig.profile_path,
           destdir,
           AutoinstConfig.xml_file
         )

diff --git a/test/AutoInstall_test.rb b/test/AutoInstall_test.rb
@@ -106,8 +106,10 @@ def self.new_from_hashes(_hash)
     let(:scripts_dir) { "/scripts" }
 
     before do
+      allow(Yast::AutoinstConfig).to receive(:profile_path)
+        .and_return(FIXTURES_PATH.join("instsys", "tmp", "profile", "autoinst.xml").to_s)
       allow(Yast::AutoinstConfig).to receive(:tmpDir)
-        .and_return(FIXTURES_PATH.join("instsys", "tmp").to_s)
+        .and_return(FIXTURES_PATH.join("instsys", "tmp", "YaST2").to_s)
       allow(Yast::AutoinstConfig).to receive(:logs_dir).and_return(logs_dir)
       allow(Yast::AutoinstConfig).to receive(:scripts_dir).and_return(scripts_dir)
       FileUtils.mkdir(File.join(destdir, logs_dir))

diff --git a/...mp/ask-default-value-scripts/ask-value.sh → ...T2/ask-default-value-scripts/ask-value.sh b/...mp/ask-default-value-scripts/ask-value.sh → ...T2/ask-default-value-scripts/ask-value.sh
diff --git a/test/fixtures/instsys/tmp/ask-scripts/ask.sh → ...ures/instsys/tmp/YaST2/ask-scripts/ask.sh b/test/fixtures/instsys/tmp/ask-scripts/ask.sh → ...ures/instsys/tmp/YaST2/ask-scripts/ask.sh
diff --git a/...s/instsys/tmp/ask-scripts/logs/ask.sh.log → ...sys/tmp/YaST2/ask-scripts/logs/ask.sh.log b/...s/instsys/tmp/ask-scripts/logs/ask.sh.log → ...sys/tmp/YaST2/ask-scripts/logs/ask.sh.log
diff --git a/...s/instsys/tmp/pre-scripts/logs/pre.sh.log → ...sys/tmp/YaST2/pre-scripts/logs/pre.sh.log b/...s/instsys/tmp/pre-scripts/logs/pre.sh.log → ...sys/tmp/YaST2/pre-scripts/logs/pre.sh.log
diff --git a/test/fixtures/instsys/tmp/pre-scripts/pre.sh → ...ures/instsys/tmp/YaST2/pre-scripts/pre.sh b/test/fixtures/instsys/tmp/pre-scripts/pre.sh → ...ures/instsys/tmp/YaST2/pre-scripts/pre.sh