No longer update resolv.conf to point to our own DNS server, let user…

…s specify the --dns=127.0.0.1 explicitly.

ipa-server-configure-first

@@ -136,17 +136,6 @@ if [ "$1" == upgrade ] ; then
 		echo "The /data volume was created using incompatible image." >&2
 		exit 2
 	fi
-	if [ -f /data/etc/resolv.conf.ipa ] \
-		&& ! cmp /etc/resolv.conf /data/etc/resolv.conf.ipa \
-		&& ! grep '^nameserver 127\.0\.0\.1$' /etc/resolv.conf ; then
-		perl -pe 's/^(nameserver).*/$1 127.0.0.1/' /data/etc/resolv.conf.ipa > /etc/resolv.conf
-		if ! grep -q "\b$HOSTNAME\b" /etc/hosts ; then
-			echo "127.0.0.2 $HOSTNAME" >> /etc/hosts
-		fi
-		echo "NOTE:" >&2
-		echo "Consider setting --dns=127.0.0.1 when using internal DNS server." >&2
-		echo "The mechanism which sets it now will be removed from images in April 2025." >&2
-	fi
 	# Removing kdcinfo.* which is likely to hold old IP address
 	rm -rf /var/lib/sss/pubconf/kdcinfo.*
 	if cmp /data/build-id /data-template/build-id ; then
@@ -210,11 +199,6 @@ else
 		usage "The container has to have fully-qualified hostname defined."
 	fi
 
-	resolv_conf_has_localhost=false
-	if grep '^nameserver 127\.0\.0\.1$' /etc/resolv.conf ; then
-		resolv_conf_has_localhost=true
-	fi
-
 	STDIN=/dev/stdin
 	STDOUT=/dev/stdout
 	STDERR=/dev/stderr
@@ -240,18 +224,12 @@ else
 		if [ "$IPA_SERVER_IP" == no-update ] ; then
 			echo "FreeIPA server IP address update disabled, skipping update-self-ip-address."
 		elif systemctl is-active -q named named-pkcs11 || [ -n "$IPA_SERVER_IP" ] ; then
-			cp -f /etc/resolv.conf /data/etc/resolv.conf.ipa
 			if wait_for_dns 180; then
 				update_server_ip_address
 			else
 				echo "Unable to resolve \"${HOSTNAME}\". Is --dns=127.0.0.1 set for the container?" >&2
 				exit 2
 			fi
-			if systemctl is-active -q named named-pkcs11 && ! $resolv_conf_has_localhost ; then
-				echo "NOTE:" >&2
-				echo "Consider setting --dns=127.0.0.1 when using internal DNS server." >&2
-				echo "The mechanism which sets it now will be removed from images in April 2025." >&2
-			fi
 		else
 			echo "FreeIPA server does not run DNS server, skipping update-self-ip-address."
 		fi