From: Roy Marples <roy@marples.name>
Date: Tue, 14 Jun 2016 21:54:24 +0000 (+0000)
Subject: Hostname documentation fixes, thanks to Olaf Seibert.
X-Git-Tag: v6.11.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c883b7b9c6adab79fb6532da974f330bf0bb1cfc;p=thirdparty%2Fdhcpcd.git

Hostname documentation fixes, thanks to Olaf Seibert.
---

diff --git a/dhcp.c b/dhcp.c
index 0fa35d7f..f7650adf 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -2508,6 +2508,8 @@ dhcp_reboot(struct interface *ifp)
 		eloop_timeout_add_sec(ifp->ctx->eloop,
 		    ifo->reboot, ipv4ll_start, ifp);
 
+	logger(ifp->ctx, LOG_INFO, "DEBUG %llu %d\n", ifo->options & DHCPCD_LASTLEASE,
+	    state->lease.frominfo);
 	if (ifo->options & DHCPCD_LASTLEASE && state->lease.frominfo)
 		eloop_timeout_add_sec(ifp->ctx->eloop,
 		    ifo->reboot, dhcp_lastlease, ifp);
diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index 9e864097..fc51b4f5 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 9, 2016
+.Dd June 14, 2016
 .Dt DHCPCD.CONF 5
 .Os
 .Sh NAME
@@ -155,7 +155,7 @@ should use with
 .Ic env
 .Va wpa_supplicant_driver=nl80211
 .Pp
-If the hostname is set, will be will set to the FQDN if possible as per
+If the hostname is set, it will be will set to the FQDN if possible as per
 RFC 4702 section 3.1.
 If the FQDN option is missing,
 .Nm dhcpcd
@@ -261,14 +261,14 @@ You can use this option to stop this from happening.
 Fallback to using this profile if DHCP fails.
 This allows you to configure a static profile instead of using ZeroConf.
 .It Ic hostname Ar name
-Sends
-.Ar hostname
+Sends the hostname
+.Ar name
 to the DHCP server so it can be registered in DNS.
 If
-.Ar hostname
+.Ar name
 is an empty string then the current system hostname is sent.
 If
-.Ar hostname
+.Ar name
 is a FQDN (ie, contains a .) then it will be encoded as such.
 .It Ic hostname_short
 Sends the short hostname to the DHCP server instead of the FQDN.