Do not remove upstream DNS configuraton in cleanup

This PR changes the logic of host cleanup so that the upstream DNS
configuration is not removed. This comes from the fact that by default
dev-scripts configure NetworkManager to use dnsmasq with DHCP-provided
DNS servers and removes the existing /etc/resolv.conf configuration.

This causes problems in environments configured without DHCP with DNS
servers configured manually without use of the NetworkManager. With this
PR user can use `ADDN_DNS` variable to provide their own DNS servers
that will be passed to the dnsmasq. At the same time when removing
dev-scripts from the system, the backup of the original /etc/resolv.conf
will be restored so that the initial system configuration is reverted.

Author: mkowalski

host_cleanup.sh

@@ -40,6 +40,7 @@ if systemctl is-active --quiet NetworkManager; then
 else
   sudo systemctl restart NetworkManager
 fi
+mv /etc/resolv.conf.dev-scripts.backup /etc/resolv.conf
 
 # There was a bug in this file, it may need to be recreated.
 # delete the interface as it can cause issues when not rebooting

utils.sh

@@ -587,6 +587,9 @@ function write_pull_secret() {
 }
 
 function switch_to_internal_dns() {
+  # Create backup of the current resolv.conf in case user is using a manual configuration. This
+  # file will be used in host_cleanup to revert the initial DNS configuration of the host.
+  cp /etc/resolv.conf /etc/resolv.conf.dev-scripts.backup
   sudo mkdir -p /etc/NetworkManager/conf.d/
   ansible localhost -b -m ini_file -a "path=/etc/NetworkManager/conf.d/dnsmasq.conf section=main option=dns value=dnsmasq"
   if [ "$ADDN_DNS" ] ; then