From 8ac6ae2920289ee30b1f88cc35f9f6d59000667c602dcf139573477296219990 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 27 Aug 2019 12:02:07 +0000 Subject: [PATCH] Accepting request 722585 from home:dirkmueller:branches:network:dhcp - dhclient-script: replace host(1) with getent, which is more lightweight (part of glibc and does not pull in bind-utils) OBS-URL: https://build.opensuse.org/request/show/722585 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=199 --- dhclient-script | 4 ++-- dhcp.changes | 6 ++++++ dhcp.spec | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dhclient-script b/dhclient-script index 995b00b..c8792a8 100644 --- a/dhclient-script +++ b/dhclient-script @@ -312,8 +312,8 @@ set_hostname() if [ "x${new_host_name}" != "x" ]; then hostname "${new_host_name}" else - if [ -x /usr/bin/host ] ; then - if out=`host -W 2 "$new_ip_address" 2>/dev/null` ; then + if [ -x /usr/bin/getent ] ; then + if out=`timeout 2s /usr/bin/getent hosts "$new_ip_address" 2>/dev/null` ; then _hostname="`echo "$out" | sed 's:^.* ::; s:\..*::; s:.*[)]::'`" [[ ${_hostname} =~ ${rx_host} ]] || unset _hostname if [ "x${_hostname}" != "x" -a \ diff --git a/dhcp.changes b/dhcp.changes index 11e1ac5..b5e7476 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 8 12:19:53 UTC 2019 - Dirk Mueller + +- dhclient-script: replace host(1) with getent, which is more + lightweight (part of glibc and does not pull in bind-utils) + ------------------------------------------------------------------- Fri Aug 2 06:58:43 UTC 2019 - Martin Liška diff --git a/dhcp.spec b/dhcp.spec index 7106833..fa403bc 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -111,7 +111,7 @@ Requires(pre): group(nogroup) %package client Summary: ISC DHCP Client Group: Productivity/Networking/Boot/Clients -Requires: %{_bindir}/host +Requires: %{_bindir}/getent Requires: %{_bindir}/touch Requires: dhcp = %{version} Requires: iproute2