@@ -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));
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 <thuth@redhat.com> --- lib/libnet/ping.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)