Skip to content

Commit

Permalink
Improved documentation and small refactoring in proposing DNS config.
Browse files Browse the repository at this point in the history
  • Loading branch information
mchf committed May 2, 2016
1 parent 7f698e8 commit d9d50a9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
13 changes: 7 additions & 6 deletions src/clients/save_network.rb
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,14 @@ def copy_from_instsys
nil
end

# Creates DNS configuration on target
# Creates target's default DNS configuration
#
# It uses DNS configuration as defined in AY profile (if any) or
# proposes a predefined default values.
def configure_dns
if Mode.autoinst
NetworkAutoYast.instance.configure_dns
else
NetworkAutoconfiguration.instance.configure_dns
end
ret = false
ret = NetworkAutoYast.instance.configure_dns if Mode.autoinst
ret = NetworkAutoconfiguration.instance.configure_dns if !ret

DNS.create_hostname_link
end
Expand Down
9 changes: 8 additions & 1 deletion src/lib/network/network_autoyast.rb
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,23 @@ def set_network_service
end

# Initializates DNS setup according AY profile
#
# FIXME: it currently don't write DNS configuration. It is used for initialization
# of DNS setup according AY profile in 1st stage as part of network setup was moved
# here already and some parts of network configuration needs to know it. DNS write
# is still done in 2nd stage.
def configure_dns
ay_dns_config = ay_networking_section["dns"]

return if !ay_dns_config
return false if !ay_dns_config

DNS.Import(ay_dns_config)

log.info("NetworkAutoYast: DNS / Hostname configuration")
log.info("dhcp hostname: #{DNS.dhcp_hostname}")
log.info("write hostname: #{DNS.write_hostname}")

return true
end

# Checks if the profile asks for keeping installation network configuration
Expand Down

0 comments on commit d9d50a9

Please sign in to comment.