From 9e34542c0fc0a1ec1b28ff81f812d2cd4f38df64 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 19 Sep 2016 21:08:24 +0200 Subject: libnet: Fix the printout of the ping command Commit 7e31382cca5fb988b ("Improve printed text when booting via network") moved the "Requesting information via DHCP..." printf statement from the netboot() function into the dhcp() function. However, it did not take into account that the ping() function should be changed in the same way, so with ping, the message is currently printed out twice. So let's re-arrange the printout of ping() now accordingly. Signed-off-by: Thomas Huth Signed-off-by: Alexey Kardashevskiy --- lib/libnet/ping.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/libnet/ping.c b/lib/libnet/ping.c index 2b6a1d7..3da519f 100644 --- a/lib/libnet/ping.c +++ b/lib/libnet/ping.c @@ -156,7 +156,6 @@ ping(int argc, char *argv[]) if (!ping_args.client_ip.integer) { /* Get ip address for our mac address */ - printf(" Requesting IP address via DHCP: "); arp_failed = dhcp(0, &fn_ip, 30, F_IPV4); if (arp_failed == -1) { @@ -178,13 +177,12 @@ ping(int argc, char *argv[]) set_ipv4_netmask(ping_args.netmask); arp_failed = 1; - printf(" Own IP address: "); } // reinit network stack set_ipv4_address(fn_ip.own_ip); - printf("%d.%d.%d.%d\n", + printf(" Own IP address: %d.%d.%d.%d\n", ((fn_ip.own_ip >> 24) & 0xFF), ((fn_ip.own_ip >> 16) & 0xFF), ((fn_ip.own_ip >> 8) & 0xFF), (fn_ip.own_ip & 0xFF)); -- cgit v1.1