Bring back copy of common files removed by error

yast · Jan 18, 2023 · ffcd364 · ffcd364
1 parent b4b4d19
commit ffcd364
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/lib/network/clients/save_network.rb b/src/lib/network/clients/save_network.rb
@@ -99,6 +99,7 @@ def copy_from_instsys
 
         log.info("Copy network configuration files from 1st stage into installed system")
         copy_dhcp_info
+        copy_common_files
         config_copier_for(backend)&.copy
       end
 

diff --git a/test/data/instsys/etc/hostname b/test/data/instsys/etc/hostname
@@ -0,0 +1 @@
+test
diff --git a/test/save_network_test.rb b/test/save_network_test.rb
@@ -75,6 +75,13 @@
       FileUtils.remove_entry(destdir) if Dir.exist?(destdir)
     end
 
+    it "copies /etc/hostname and /etc/hosts when exist" do
+      subject.main
+      expect(File).to_not exist(File.join(destdir, "etc", "hosts"))
+      content = File.read(File.join(destdir, "etc", "hostname"))
+      expect(content).to match(/test/)
+    end
+
     it "copies wicked and DHCP files under /var/lib" do
       subject.main
       expect(File).to exist(File.join(destdir, "var", "lib", "dhcp", "dhclient.leases"))