rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Default /etc/dhcp/dhclient.conf (send dhcp-client-identifier) (#560361)

Browse Source
This commit is contained in:
Jiri Popelka 2010-12-21 14:03:52 +01:00
parent 43f4ae0815
commit 7a66932b50
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dhcp.spec
View File

@ -12,7 +12,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.2.0 Version: 4.2.0
Release: 23.%{patchver}%{?dist} Release: 24.%{patchver}%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -448,20 +448,34 @@ EOF
# #
# DHCP Server Configuration file. # DHCP Server Configuration file.
# see /usr/share/doc/dhcp*/dhcpd.conf.sample # see /usr/share/doc/dhcp*/dhcpd.conf.sample
# see 'man 5 dhcpd.conf' # see dhcpd.conf(5) man page
# #
EOF EOF
# Install default (empty) dhcpd6.conf: # Install default (empty) dhcpd6.conf:
%{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd6.conf %{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd6.conf
# #
# DHCP for IPv6 Server Configuration file. # DHCPv6 Server Configuration file.
# see /usr/share/doc/dhcp*/dhcpd6.conf.sample # see /usr/share/doc/dhcp*/dhcpd6.conf.sample
# see 'man 5 dhcpd.conf' # see dhcpd.conf(5) man page
# run 'service dhcpd6 start' or 'dhcpd -6 -cf /etc/dhcp/dhcpd6.conf' # run 'service dhcpd6 start' or 'dhcpd -6 -cf /etc/dhcp/dhcpd6.conf'
# #
EOF EOF
# Install default (empty) dhclient.conf:
%{__mkdir} -p %{buildroot}%{dhcpconfdir}
%{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhclient.conf
#
# DHCP Client Configuration file.
# see /usr/share/doc/dhclient-*/dhclient.conf.sample
# see dhclient.conf(5) man page
#
# Send client identifier as "hardware type.link-layer address" (e.g. "1.c2.23.7d.c3.52.2c")
# Required in environments where a bridge might be clobbering the forwarded
# packet's MAC address (common in Wifi, Docsis, or ADSL bridging scenarios)
send dhcp-client-identifier = hardware;
EOF
# Install dhcp.schema for LDAP configuration # Install dhcp.schema for LDAP configuration
%{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema %{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema
%{__install} -p -m 0644 -D contrib/ldap/dhcp.schema \ %{__install} -p -m 0644 -D contrib/ldap/dhcp.schema \
@ -597,6 +611,7 @@ fi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc dhclient.conf.sample dhclient6.conf.sample README.dhclient.d %doc dhclient.conf.sample dhclient6.conf.sample README.dhclient.d
%attr(0750,root,root) %dir %{dhcpconfdir} %attr(0750,root,root) %dir %{dhcpconfdir}
%config(noreplace) %{dhcpconfdir}/dhclient.conf
%dir %{dhcpconfdir}/dhclient.d %dir %{dhcpconfdir}/dhclient.d
%dir %{_localstatedir}/lib/dhclient %dir %{_localstatedir}/lib/dhclient
%dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager
@ -637,6 +652,10 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog %changelog
* Tue Dec 21 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.0-24.P2
- Provide default /etc/dhcp/dhclient.conf
- Client always sends dhcp-client-identifier (#560361)
* Wed Dec 15 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.0-23.P2 * Wed Dec 15 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.0-23.P2
- Add dhcp-common subpackage (#634673) - Add dhcp-common subpackage (#634673)