Merge pull request #1107 from yast/merge_SLE-15-SP2

Merge SLE-15-SP2 into master
yast · Sep 21, 2020 · f36ec11 · f36ec11
2 parents 9311171 + c7f5ae6
commit f36ec11
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 21 07:58:22 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Fix connection hostname initialization (bsc#1175579)
+- 4.3.21
+
 -------------------------------------------------------------------
 Tue Sep 15 19:51:36 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.3.20
+Version:        4.3.21
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb
@@ -129,7 +129,9 @@ def hostname(conn)
           return nil unless conn.ip
 
           Yast::Host.Read
-          Yast::Host.names(conn.ip.address.address.to_s).first
+          aliases = Yast::Host.names(conn.ip.address.address.to_s).first
+          # Use the fqdn when defined
+          aliases.to_s.split(" ").first
         end
       end
     end

diff --git a/test/data/scr_read/etc/hosts b/test/data/scr_read/etc/hosts
@@ -1,2 +1,2 @@
 127.0.0.1     localhost
-192.168.123.1 foo
+192.168.123.1 foo.example.com foo
diff --git a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb
@@ -71,7 +71,7 @@
       context "and a hostname is specified" do
         it "sets the hostname" do
           eth = handler.connection_config
-          expect(eth.hostname).to eq("foo")
+          expect(eth.hostname).to eq("foo.example.com")
         end
       end