From: Roy Marples <roy@marples.name>
Date: Mon, 3 Jun 2013 22:21:00 +0000 (+0000)
Subject: Improve messages
X-Git-Tag: v5.99.7~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8a198e4931cdf0a482d00857565805090a26662;p=thirdparty%2Fdhcpcd.git

Improve messages
---

diff --git a/dhcp.c b/dhcp.c
index 6f96588e..5514f3aa 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -1631,10 +1631,10 @@ dhcp_discover(void *arg)
 			eloop_timeout_add_sec(timeout, ipv4ll_start, iface);
 	}
 	if (ifo->options & DHCPCD_REQUEST)
-		syslog(LOG_INFO, "%s: broadcasting for a lease (requesting %s)",
+		syslog(LOG_INFO, "%s: soliciting a DHCP lease (requesting %s)",
 		    iface->name, inet_ntoa(ifo->req_addr));
 	else
-		syslog(LOG_INFO, "%s: broadcasting for a lease", iface->name);
+		syslog(LOG_INFO, "%s: soliciting a DHCP lease", iface->name);
 	send_discover(iface);
 }
 
@@ -1662,7 +1662,7 @@ dhcp_expire(void *arg)
 		return;
 	}
 
-	syslog(LOG_ERR, "%s: lease expired", ifp->name);
+	syslog(LOG_ERR, "%s: DHCP lease expired", ifp->name);
 	eloop_timeout_delete(NULL, ifp);
 	dhcp_drop(ifp, "EXPIRE");
 	unlink(state->leasefile);
@@ -1702,7 +1702,7 @@ dhcp_rebind(void *arg)
 	struct dhcp_state *state = D_STATE(ifp);
 	struct dhcp_lease *lease = &state->lease;
 
-	syslog(LOG_WARNING, "%s: failed to renew, attempting to rebind",
+	syslog(LOG_WARNING, "%s: failed to renew DHCP, rebinding",
 	    ifp->name);
 	syslog(LOG_DEBUG, "%s: expire in %"PRIu32" seconds",
 	    ifp->name, lease->leasetime - lease->rebindtime);
diff --git a/dhcp6.c b/dhcp6.c
index 7c307da9..eec54992 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -817,7 +817,7 @@ dhcp6_startrebind(void *arg)
 	eloop_timeout_delete(dhcp6_sendrenew, ifp);
 	state = D6_STATE(ifp);
 	if (state->state == DH6S_RENEW)
-		syslog(LOG_WARNING, "%s: failed to renew, rebinding",
+		syslog(LOG_WARNING, "%s: failed to renew DHCPv6, rebinding",
 		    ifp->name);
 	state->state = DH6S_REBIND;
 	state->RTC = 0;