From d6212f3a9a4edb436cc1a1f782f9d3347afe0a26 Mon Sep 17 00:00:00 2001
From: angelos <angelos@openbsd.org>
Date: Thu, 20 Apr 2000 08:14:21 +0000
Subject: [PATCH] If /etc/resolv.conf.tail exists, append to newly-constructed
 /etc/resolv.conf

---
 usr.sbin/dhcp/dhclient/scripts/dhclient-script | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/dhcp/dhclient/scripts/dhclient-script b/usr.sbin/dhcp/dhclient/scripts/dhclient-script
index 0f8d5430e57..6b0e83d874b 100644
--- a/usr.sbin/dhcp/dhclient/scripts/dhclient-script
+++ b/usr.sbin/dhcp/dhclient/scripts/dhclient-script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: dhclient-script,v 1.4 2000/02/11 01:23:18 chris Exp $
+# $OpenBSD: dhclient-script,v 1.5 2000/04/20 08:14:21 angelos Exp $
 #
 
 if [ x$new_network_number != x ]; then
@@ -96,6 +96,9 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
       for nameserver in $new_domain_name_servers; do
         echo nameserver $nameserver >>/etc/resolv.conf
       done
+      if [ -f /etc/resolv.conf.tail ]; then
+	cat /etc/resolv.conf.tail >>/etc/resolv.conf
+      fi
       exit 0
     fi
   fi
@@ -162,6 +165,9 @@ if [ x$reason = xTIMEOUT ]; then
           for nameserver in $new_domain_name_servers; do
   	    echo nameserver $nameserver >>/etc/resolv.conf.std
           done
+          if [ -f /etc/resolv.conf.tail ]; then
+	    cat /etc/resolv.conf.tail >>/etc/resolv.conf.std
+      	  fi
           if [ -f /etc/resolv.conf ]; then
 	    rm -f /etc/resolv.conf
           fi
-- 
2.20.1