diff --git a/dhcp-3.1.1-dhclient-conf.dif b/dhcp-3.1.1-dhclient-conf.dif index 14b8322..6a758c1 100644 --- a/dhcp-3.1.1-dhclient-conf.dif +++ b/dhcp-3.1.1-dhclient-conf.dif @@ -35,8 +35,8 @@ -require subnet-mask, domain-name-servers; + +# Request several well known/usefull dhcp options. -+request subnet-mask, network-number, broadcast-address, -+ routers, interface-mtu, host-name, domain-name, ++request subnet-mask, broadcast-address, routers, ++ interface-mtu, host-name, domain-name, + domain-name-servers, nis-domain, nis-servers, + nds-context, nds-servers, nds-tree-name, + netbios-name-servers, netbios-dd-server, diff --git a/dhcp-3.1.1-dhclient-script.dif b/dhcp-3.1.1-dhclient-script.dif index ad66d4c..63ce5ac 100644 --- a/dhcp-3.1.1-dhclient-script.dif +++ b/dhcp-3.1.1-dhclient-script.dif @@ -114,7 +114,7 @@ + (new_network_number) k='NETWORK' ;; + (new_broadcast_address) k='BROADCAST' ;; + (new_interface_mtu) k='MTU' ;; -+ #(new_static_routes) k='ROUTES' ;; ++ # (new_static_routes) k='ROUTES' ;; + (new_routers) k='GATEWAYS' ;; + (new_host_name) k='HOSTNAME' ;; + (new_domain_name) k='DNSDOMAIN' ;; diff --git a/dhcp.changes b/dhcp.changes index adab2f3..6f3a707 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Nov 26 08:05:01 CET 2008 - coolo@suse.de + +- prereq sysconfig to avoid warnings about missing + /etc/sysconfig/dhcp + +------------------------------------------------------------------- +Mon Nov 24 13:00:39 CET 2008 - mt@suse.de + +- Removed network-number request from dhclient.conf (bnc#443788). + ------------------------------------------------------------------- Tue Nov 11 11:12:23 CET 2008 - mt@suse.de diff --git a/dhcp.spec b/dhcp.spec index f08a6a5..def032e 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -31,7 +31,7 @@ License: BSD 3-Clause Group: Productivity/Networking/Boot/Servers AutoReqProv: on Version: 3.1.1 -Release: 5 +Release: 6 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 @@ -86,7 +86,7 @@ Patch60: dhcp-3.1.1-dhclient-script.dif ## Obsoletes: dhcp-base Provides: dhcp-base:/usr/bin/omshell -PreReq: /bin/touch /sbin/chkconfig +PreReq: /bin/touch /sbin/chkconfig sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %package server @@ -486,6 +486,11 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %doc %{_mandir}/man3/dhcpctl.3.gz %changelog +* Wed Nov 26 2008 coolo@suse.de +- prereq sysconfig to avoid warnings about missing + /etc/sysconfig/dhcp +* Mon Nov 24 2008 mt@suse.de +- Removed network-number request from dhclient.conf (bnc#443788). * Tue Nov 11 2008 mt@suse.de - Fixed dhclient-script to apply DHCLIENT_SET_HOSTNAME and SET_DEFAULT_ROUTE policy correctly and inclusive of per