From: Roy Marples <roy@marples.name>
Date: Thu, 28 Jun 2012 09:11:24 +0000 (+0000)
Subject: Report RA information when testing.
X-Git-Tag: v5.6.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=359e9d397807079db8d68d5e60eb4396f41d1738;p=thirdparty%2Fdhcpcd.git

Report RA information when testing.
---

diff --git a/configure.c b/configure.c
index 4b610c8b..a2d262f5 100644
--- a/configure.c
+++ b/configure.c
@@ -172,7 +172,12 @@ make_env(const struct interface *iface, const char *reason, char ***argv)
 	int dhcp, ra;
 
 	dhcp = ra = 0;
-	if (strcmp(reason, "ROUTERADVERT") == 0)
+	if (strcmp(reason, "TEST") == 0) {
+		if (iface->ras)
+			ra = 1;
+		else
+			dhcp = 1;
+	} else if (strcmp(reason, "ROUTERADVERT") == 0)
 		ra = 1;
 	else
 		dhcp = 1;
diff --git a/dhcpcd-hooks/01-test b/dhcpcd-hooks/01-test
index b46d4005..ac71f089 100644
--- a/dhcpcd-hooks/01-test
+++ b/dhcpcd-hooks/01-test
@@ -2,5 +2,5 @@
 
 if [ "$reason" = "TEST" ]; then
 	set | grep "^\(interface\|metric\|pid\|reason\|skip_hooks\)=" | sort
-	set | grep "^\(new_\|old_\)" | sort
+	set | grep "^\(new_\|old_\|ra_count=\|ra[0-9]*_\)" | sort
 fi