diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-04-20 08:14:22 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-04-20 08:14:22 +0000 |
| commit | 869473120b134689b02e53a9611b307c1afc60a5 (patch) | |
| tree | ae2f91a0fe648e138deec198abaf2e8e2d2389d0 /usr.sbin | |
| parent | 71d556defeb8df9ba72d0dae71fe2f9ff5797998 (diff) | |
If /etc/resolv.conf.tail exists, append to newly-constructed
/etc/resolv.conf
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/dhcp/dhclient/scripts/dhclient-script | 8 |
1 files changed, 7 insertions, 1 deletions
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 |