Create symlink /etc/HOSTNAME to avoid backward compatibility issues.

src/clients/save_network.rb

@@ -262,6 +262,8 @@ def configure_target
 
       LanUdevAuto.Write if Mode.autoinst
 
+      DNS.create_hostname_link
+
       SCR.Execute(path(".target.bash"), "chkconfig network on")
 
       # if portmap running - start it after reboot

src/modules/DNS.rb

@@ -34,6 +34,8 @@
 module Yast
   class DNSClass < Module
 
+    include Logger
+
     HOSTNAME_FILE = "hostname"
     HOSTNAME_PATH = "/etc/" + HOSTNAME_FILE
 
@@ -234,11 +236,8 @@ def ReadHostname
         fqhostname = read_hostname_from_install_inf
       end
 
-      if fqhostname.empty? && FileUtils.Exists(HOSTNAME_PATH)
-        fqhostname = SCR.Read(path(".target.string"), HOSTNAME_PATH)
-        #avoid passing nil argument when we get non-\n-terminated string (#445531)
-        fqhostname = String.FirstChunk(fqhostname, "\n")
-        Builtins.y2milestone("Got #{fqhostname} from #{HOSTNAME_PATH}")
+      if fqhostname.empty?
+        fqhostname = read_hostname_from_etc
       end
 
       split = Hostname.SplitFQ(fqhostname)
@@ -397,6 +396,9 @@ def Write
         HOSTNAME_PATH,
         Ops.add(fqhostname, "\n")
       )
+
+      create_hostname_link
+
       Builtins.sleep(sl)
 
       # Progress step 2/3
@@ -645,6 +647,20 @@ def IsHostLocal(check_host)
       false
     end
 
+    # Creates symlink /etc/HOSTNAME -> /etc/hostname to gurantee backward compatibility
+    # after changes in bnc#858908
+    def create_hostname_link
+      link_name = "/etc/HOSTNAME"
+      return if FileUtils.IsLink(link_name)
+
+      log.info "Creating #{link_name} symlink"
+
+      SCR.Execute(path(".target.bash"), "rm #{link_name}") if FileUtils.Exists(link_name)
+      SCR.Execute(path(".target.bash"), "ln -s #{DNSClass::HOSTNAME_PATH} #{link_name}")
+
+      nil
+    end
+
   private
     def read_hostname_from_install_inf
       install_inf_hostname = SCR.Read(path(".etc.install_inf.Hostname")) || ""
@@ -667,6 +683,25 @@ def read_hostname_from_install_inf
       return fqhostname
     end
 
+    def read_hostname_from_etc
+      if FileUtils.Exists(HOSTNAME_PATH)
+        hostname_path = HOSTNAME_PATH
+      elsif FileUtils.Exists("/etc/HOSTNAME")
+        # backward compatibility due to changes done in bnc#858908
+        hostname_path = "/etc/HOSTNAME"
+      else
+        return ""
+      end
+
+      fqhostname = SCR.Read(path(".target.string"), hostname_path) || ""
+
+      #avoid passing nil argument when we get non-\n-terminated string (#445531)
+      fqhostname = String.FirstChunk(fqhostname, "\n")
+      log.info("Read #{fqhostname} from '/etc/'")
+
+      return fqhostname
+    end
+
     publish :variable => :proposal_valid, :type => "boolean"
     publish :variable => :hostname, :type => "string"
     publish :variable => :domain, :type => "string"