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

- Prevent $metric from being set to '' (#460640)

Browse Source 
- Remove unnecessary warning messages
- Do not source config file (ifcfg-DEVICE) unless it exists
This commit is contained in:
David Cantrell 2008-08-29 21:52:04 +00:00
parent f7db77fa1a
commit 2bb1b9309a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux → dhclient-script
View File

@ -239,7 +239,7 @@ dhconfig() {
(( -z "$GATEWAY" ) || (( -z "$GATEWAY" ) ||
(( -n "$DHCLIENT_IGNORE_GATEWAY" ) && (( -n "$DHCLIENT_IGNORE_GATEWAY" ) &&
( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* ))) ]]; then ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* ))) ]]; then
metric="${METRIC:-''}" metric="${METRIC:-}"
let i="${METRIC:-0}" let i="${METRIC:-0}"
default_routers=() default_routers=()
@ -451,12 +451,8 @@ need_config ${CONFIG}
if [ -f "${CONFIG}" ]; then if [ -f "${CONFIG}" ]; then
source_config source_config
else
echo "${0}: configuration for ${interface} not found. Continuing with defaults." >&2
fi fi
source_config
if [ -n "${new_subnet_mask}" ]; then if [ -n "${new_subnet_mask}" ]; then
new_prefix="$(ipcalc -p ${new_ip_address} ${new_subnet_mask} | cut -d '=' -f 2)" new_prefix="$(ipcalc -p ${new_ip_address} ${new_subnet_mask} | cut -d '=' -f 2)"
fi fi

11
dhcp.spec
View File

@ -4,7 +4,7 @@
Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent
Name: dhcp Name: dhcp
Version: 4.0.0 Version: 4.0.0
Release: 22%{?dist} Release: 23%{?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.
@ -20,7 +20,7 @@ Source3: libdhcp4client.pc
Source5: README.ldap Source5: README.ldap
Source6: draft-ietf-dhc-ldap-schema-01.txt Source6: draft-ietf-dhc-ldap-schema-01.txt
Source7: dhcpd-conf-to-ldap Source7: dhcpd-conf-to-ldap
Source8: linux Source8: dhclient-script
Source9: dhcp4client.h Source9: dhcp4client.h
Source10: libdhcp_control.h Source10: libdhcp_control.h
Source11: dhcp.schema Source11: dhcp.schema
@ -209,7 +209,7 @@ client library.
%{__install} -p -m 0755 %{SOURCE7} contrib/ %{__install} -p -m 0755 %{SOURCE7} contrib/
# Copy in the Fedora/RHEL dhclient script # Copy in the Fedora/RHEL dhclient script
%{__install} -p -m 0755 %{SOURCE8} client/scripts/ %{__install} -p -m 0755 %{SOURCE8} client/scripts/linux
# Copy in the libdhcp4client headers and Makefile.dist # Copy in the libdhcp4client headers and Makefile.dist
%{__install} -p -m 0644 %{SOURCE9} includes/ %{__install} -p -m 0644 %{SOURCE9} includes/
@ -440,6 +440,11 @@ fi
%{_libdir}/libdhcp4client.so %{_libdir}/libdhcp4client.so
%changelog %changelog
* Fri Aug 29 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-23
- Prevent $metric from being set to '' (#460640)
- Remove unnecessary warning messages
- Do not source config file (ifcfg-DEVICE) unless it exists
* Sun Aug 24 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-22 * Sun Aug 24 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-22
- Add missing '[' to dhclient-script (#459860) - Add missing '[' to dhclient-script (#459860)
- Correct test statement in add_default_gateway() in dhclient-script (#459860) - Correct test statement in add_default_gateway() in dhclient-script (#459860)