rpms/dhcp/F-12 dhclient-script,1.15,1.16 dhcp.spec,1.278,1.279
Jiří Popelka
jpopelka at fedoraproject.org
Mon Nov 23 09:12:08 UTC 2009
- Previous message: rpms/iptux/F-12 .cvsignore, 1.4, 1.5 iptux.spec, 1.5, 1.6 sources, 1.4, 1.5
- Next message: rpms/iptux/F-11 .cvsignore, 1.4, 1.5 iptux.spec, 1.5, 1.6 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jpopelka
Update of /cvs/pkgs/rpms/dhcp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6548
Modified Files:
dhclient-script dhcp.spec
Log Message:
* Mon Nov 23 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-14
- Honor DEFROUTE=yes|no for all connection types (#530209)
Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhclient-script,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dhclient-script 30 Oct 2009 09:53:06 -0000 1.15
+++ dhclient-script 23 Nov 2009 09:12:07 -0000 1.16
@@ -272,45 +272,45 @@ dhconfig() {
. ${ETCDIR}/dhclient-up-hooks
fi
- if [[ (( -z "${GATEWAYDEV}" ) ||
- ( "${GATEWAYDEV}" = "${interface}" )) &&
- (( -z "$GATEWAY" ) ||
- (( -n "$DHCLIENT_IGNORE_GATEWAY" ) &&
- ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* ))) ]]; then
- metric="${METRIC:-}"
- let i="${METRIC:-0}"
- default_routers=()
-
- for router in ${new_routers} ; do
- added_router=-
-
- for r in ${default_routers[@]} ; do
- if [ "${r}" = "${router}" ]; then
- added_router=1
+ if [[ ( "${DEFROUTE}" != "no") &&
+ (( -z "${GATEWAYDEV}" ) ||
+ ( "${GATEWAYDEV}" = "${interface}" )) ]]; then
+ if [[ ( -z "$GATEWAY" ) ||
+ (( -n "$DHCLIENT_IGNORE_GATEWAY" ) &&
+ ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* )) ]]; then
+ metric="${METRIC:-}"
+ let i="${METRIC:-0}"
+ default_routers=()
+
+ for router in ${new_routers} ; do
+ added_router=-
+
+ for r in ${default_routers[@]} ; do
+ if [ "${r}" = "${router}" ]; then
+ added_router=1
+ fi
+ done
+
+ if [ -z "${router}" ] ||
+ [ "${added_router}" = "1" ] ||
+ [ $(IFS=. ip2num ${router}) -le 0 ] ||
+ [[ ( "${router}" = "${new_broadcast_address}" ) &&
+ ( "${new_subnet_mask}" != "255.255.255.255" ) ]]; then
+ continue
fi
+
+ default_routers=(${default_routers[@]} ${router})
+ add_default_gateway ${router} ${metric}
+ let i=i+1
+ metric=${i}
done
+ elif [ -n "${GATEWAY}" ]; then
+ routersubnet=$(mask ${GATEWAY} ${new_subnet_mask})
+ mysubnet=$(mask ${new_ip_address} ${new_subnet_mask})
- if [ -z "${router}" ] ||
- [ "${added_router}" = "1" ] ||
- [ $(IFS=. ip2num ${router}) -le 0 ] ||
- [[ ( "${router}" = "${new_broadcast_address}" ) &&
- ( "${new_subnet_mask}" != "255.255.255.255" ) ]]; then
- continue
+ if [ "${routersubnet}" = "${mysubnet}" ]; then
+ ip route replace default via ${GATEWAY} dev ${interface}
fi
-
- default_routers=(${default_routers[@]} ${router})
- add_default_gateway ${router} ${metric}
- let i=i+1
- metric=${i}
- done
- elif [[ (( -z "${GATEWAYDEV}" ) ||
- ( "${GATEWAYDEV}" = "${interface}" )) &&
- ( -n "${GATEWAY}" ) ]]; then
- routersubnet=$(mask ${GATEWAY} ${new_subnet_mask})
- mysubnet=$(mask ${new_ip_address} ${new_subnet_mask})
-
- if [ "${routersubnet}" = "${mysubnet}" ]; then
- ip route replace default via ${GATEWAY} dev ${interface}
fi
fi
Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhcp.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- dhcp.spec 30 Oct 2009 09:53:06 -0000 1.278
+++ dhcp.spec 23 Nov 2009 09:12:07 -0000 1.279
@@ -13,7 +13,7 @@
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: %{basever}p1
-Release: 13%{?dist}
+Release: 14%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# 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.
@@ -481,6 +481,9 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog
+* Mon Nov 23 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-14
+- Honor DEFROUTE=yes|no for all connection types (#530209)
+
* Fri Oct 30 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-13
- Make dhclient-script add IPv6 address to interface (#531997)
- Previous message: rpms/iptux/F-12 .cvsignore, 1.4, 1.5 iptux.spec, 1.5, 1.6 sources, 1.4, 1.5
- Next message: rpms/iptux/F-11 .cvsignore, 1.4, 1.5 iptux.spec, 1.5, 1.6 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list