happy rubocop

yast · Jun 9, 2017 · 79466b0 · 79466b0
1 parent 92e2089
commit 79466b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun  9 09:40:11 UTC 2017 - mfilka@suse.com
+
+- Moving network setup in AY into 1s stage
+  - DNS configuration is written when second stage is disabled in
+    the profile
+
 -------------------------------------------------------------------
 Thu May 25 09:27:09 UTC 2017 - mfilka@suse.com
 

diff --git a/src/lib/network/network_autoyast.rb b/src/lib/network/network_autoyast.rb
@@ -118,7 +118,7 @@ def configure_dns(write: false)
 
       DNS.Import(ay_dns_config)
 
-      write ||= !ay_general_section.fetch("mode", { "second_stage" => true })["second_stage"]
+      write ||= !ay_general_section.fetch("mode", "second_stage" => true)["second_stage"]
 
       log.info("NetworkAutoYast: DNS / Hostname configuration")
       log.info("dhcp hostname: #{DNS.dhcp_hostname}")
@@ -219,7 +219,7 @@ def ay_current_profile
       ay_profile = Profile.current
 
       return {} if ay_profile.nil? || ay_profile.empty?
-      return ay_profile
+      ay_profile
     end
 
     # Returns networking section of current AY profile