diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2012-12-05 17:17:49 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2012-12-05 17:17:49 +0000 |
| commit | 251c884ebd22672a33ed570efacd0becf1a630d0 (patch) | |
| tree | ad8fad67b000dc24fce78cabcd00c0d98146df6a /share | |
| parent | c533fca4415fc06dc7bdb437787931eecbc269cc (diff) | |
document that resolv.conf is now not unconditionally overwritten;
text/ok krw
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man5/resolv.conf.5 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5 index 10d43dc44a1..92c392497bc 100644 --- a/share/man/man5/resolv.conf.5 +++ b/share/man/man5/resolv.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: resolv.conf.5,v 1.40 2012/11/27 14:43:37 jmc Exp $ +.\" $OpenBSD: resolv.conf.5,v 1.41 2012/12/05 17:17:48 jmc Exp $ .\" $NetBSD: resolv.conf.5,v 1.7 1996/03/06 18:22:16 scottr Exp $ .\" .\" Copyright (c) 1986, 1991 The Regents of the University of California. @@ -30,7 +30,7 @@ .\" .\" @(#)resolver.5 5.12 (Berkeley) 5/10/91 .\" -.Dd $Mdocdate: November 27 2012 $ +.Dd $Mdocdate: December 5 2012 $ .Dt RESOLV.CONF 5 .Os .Sh NAME @@ -75,9 +75,14 @@ routines, the file may be created manually. This file will be appended to the generated .Nm resolv.conf -file by -.Xr dhclient 8 , +file by dhclient, ensuring options remain. +If no updated information is available to dhclient, +and +.Nm resolv.conf.tail +is not present, then +.Nm resolv.conf +will not be modified by dhclient. .Pp On a machine whose network connection does not change frequently (such as a desktop machine on a local-area network), the |