OBS User unknown 2008-05-23 15:06:44 +00:00 committed by Git OBS Bridge
parent 91fa859152
commit dd1dd8a44e
3 changed files with 23 additions and 1 deletions

View File

@ -0,0 +1,13 @@
--- dhcp-3.0.6/client/scripts/linux
+++ dhcp-3.0.6/client/scripts/linux 2008/05/23 13:41:28
@@ -326,7 +326,9 @@
hostname $new_host_name
else
if [ -x /usr/bin/host ] ; then
- hostname `host "$new_ip_address" | sed 's:^.* ::; s:\..*::'`
+ if out=`host -W 2 "$new_ip_address" 2>/dev/null` ; then
+ hostname `echo "$out" | sed 's:^.* ::; s:\..*::'`
+ fi
fi
fi

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 23 15:55:14 CEST 2008 - mt@suse.de
- Don't set parts of host error messages as hostname (bnc#389668).
-------------------------------------------------------------------
Mon May 19 15:47:19 CEST 2008 - mt@suse.de

View File

@ -24,7 +24,7 @@ License: BSD 3-Clause
Group: Productivity/Networking/Boot/Servers
AutoReqProv: on
Version: 3.0.6
Release: 82
Release: 83
Summary: Common Files Used by ISC DHCP Software
Url: http://www.isc.org/isc/dhcp.html
Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@ -88,6 +88,7 @@ Patch84: dhcp-send-hostname-rml.patch
Patch85: dhcp-3.0.6-dhclient-conf-requests.patch
Patch86: dhcp-3.0.6-dhclient-conf-no-script.patch
Patch87: dhcp-3.0.6-dhclient-conf-requires.patch
Patch88: dhcp-3.0.6-dhclient-script-sethostname.patch
Obsoletes: dhcp-base
Provides: dhcp-base:/usr/bin/omshell
PreReq: /bin/touch /sbin/chkconfig
@ -223,6 +224,7 @@ Authors:
%patch85 -p1
%patch86 -p1
%patch87 -p1
%patch88 -p1
find . -type f -name \*.cat\* -exec rm -f {} \;
cp -p %{S:2} %{S:3} %{S:11} %{S:12} %{S:14} %{S:32} %{S:33} .
for i in README LIESMICH; do
@ -490,6 +492,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%doc %{_mandir}/man3/dhcpctl.3.gz
%changelog
* Fri May 23 2008 mt@suse.de
- Don't set parts of host error messages as hostname (bnc#389668).
* Mon May 19 2008 mt@suse.de
- Documentation updates for DDNS-howto.txt (bnc#359977).
* Fri Apr 04 2008 mt@suse.de