From 16af3755e077fea5627744abb192c3cba844e541 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 24 Jul 2020 05:00:49 -0600
Subject: [PATCH] use "use loopback" hint instead of "inet loopback", same with
 dhcp

---
 cmd/ifquery.c                | 9 +--------
 libifupdown/interface-file.c | 5 +++--
 libifupdown/interface.c      | 1 +
 tests/ifquery_test           | 4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/cmd/ifquery.c b/cmd/ifquery.c
index b40e8d6..ee21fae 100644
--- a/cmd/ifquery.c
+++ b/cmd/ifquery.c
@@ -27,14 +27,7 @@ print_interface(struct lif_interface *iface)
 	if (iface->is_auto)
 		printf("auto %s\n", iface->ifname);
 
-	printf("iface %s", iface->ifname);
-
-	if (iface->is_loopback)
-		printf(" inet loopback\n");
-	else if (iface->is_dhcp)
-		printf(" inet dhcp\n");
-	else
-		printf("\n");
+	printf("iface %s\n", iface->ifname);
 
 	struct lif_node *iter;
 	LIF_DICT_FOREACH(iter, &iface->vars)
diff --git a/libifupdown/interface-file.c b/libifupdown/interface-file.c
index b540101..f1dcbad 100644
--- a/libifupdown/interface-file.c
+++ b/libifupdown/interface-file.c
@@ -91,9 +91,10 @@ lif_interface_file_parse(struct lif_dict *collection, const char *filename)
 				continue;
 
 			if (!strcmp(hint, "dhcp"))
+			{
 				cur_iface->is_dhcp = true;
-			else if (!strcmp(hint, "loopback"))
-				cur_iface->is_loopback = true;
+				lif_dict_add(&cur_iface->vars, "use", strdup("dhcp"));
+			}
 		}
 		else if (!strcmp(token, "use"))
 		{
diff --git a/libifupdown/interface.c b/libifupdown/interface.c
index f486351..7d59813 100644
--- a/libifupdown/interface.c
+++ b/libifupdown/interface.c
@@ -135,6 +135,7 @@ lif_interface_collection_init(struct lif_dict *collection)
 	/* always enable loopback interface as part of a collection */
 	if_lo = lif_interface_collection_find(collection, "lo");
 	if_lo->is_auto = if_lo->is_loopback = true;
+	lif_dict_add(&if_lo->vars, "use", strdup("loopback"));
 
 	lif_interface_address_add(if_lo, "127.0.0.1/8");
 }
diff --git a/tests/ifquery_test b/tests/ifquery_test
index 5b191b9..f3a5299 100755
--- a/tests/ifquery_test
+++ b/tests/ifquery_test
@@ -18,7 +18,7 @@ noargs_body() {
 }
 
 loopback_always_configured_body() {
-	atf_check -s exit:0 -o match:"inet loopback" \
+	atf_check -s exit:0 -o match:"use loopback" \
 		ifquery -S/dev/null -i $FIXTURES/static-eth0.interfaces lo
 }
 
@@ -43,7 +43,7 @@ static_ipv6_body() {
 }
 
 dhcp_ipv4_body() {
-	atf_check -s exit:0 -o match:"inet dhcp" \
+	atf_check -s exit:0 -o match:"use dhcp" \
 		  ifquery -S/dev/null -i $FIXTURES/dhcp-eth0.interfaces eth0
 }