jpopelka pushed to dhcp (master). "dhclient-script: amend previous change (#1210984)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 16:19:02 UTC 2015
>From 8568b714e796c41c2ff8b74efe9afaa4f81e0f21 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka at redhat.com>
Date: Mon, 13 Apr 2015 18:18:18 +0200
Subject: dhclient-script: amend previous change (#1210984)
diff --git a/dhclient-script b/dhclient-script
index 84bad21..eba6f13 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -204,7 +204,7 @@ quad2num() {
}
ip2num() {
- IFS="." quad2num "${1}"
+ IFS='.' quad2num ${1}
}
num2ip() {
@@ -279,11 +279,11 @@ add_default_gateway() {
router="${1}"
if is_router_reachable "${router}" ; then
- metric=""
- if [ $# -gt 1 ] && [ "${2}" -gt 0 ]; then
- metric="metric ${2}"
+ if [ $# -gt 1 ] && [ -n "${2}" ] && [[ "${2}" -gt 0 ]]; then
+ ip -4 route replace default via "${router}" dev "${interface}" metric "${2}"
+ else
+ ip -4 route replace default via "${router}" dev "${interface}"
fi
- ip -4 route replace default via "${router}" dev "${interface}" "${metric}"
if [ $? -ne 0 ]; then
logmessage "failed to create default route: ${router} dev ${interface} ${metric}"
return 1
@@ -428,7 +428,7 @@ dhconfig() {
metric="metric ${metric}"
fi
- ip -4 route replace "${target}/${prefix}" proto static via "${gateway}" dev "${interface}" "${metric}" "${scope}"
+ ip -4 route replace "${target}/${prefix}" proto static via "${gateway}" dev "${interface}" ${metric} ${scope}
if [ $? -ne 0 ]; then
logmessage "failed to create static route: ${target}/${prefix} via ${gateway} dev ${interface} ${metric}"
@@ -459,7 +459,7 @@ dhconfig() {
if [ -z "${router}" ] ||
[ "${added_router}" = "1" ] ||
- [ "$(IFS=. ip2num ${router})" -le 0 ] ||
+ [ "$(IFS='.' ip2num ${router})" -le 0 ] ||
[[ ( "${router}" = "${new_broadcast_address}" ) &&
( "${new_subnet_mask}" != "255.255.255.255" ) ]]; then
continue
diff --git a/dhcp.spec b/dhcp.spec
index 9383442..f832934 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: 4.3.2
-Release: 3%{?dist}
+Release: 4%{?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.
@@ -675,6 +675,9 @@ done
%doc doc/html/
%changelog
+* Mon Apr 13 2015 Jiri Popelka <jpopelka at redhat.com> - 12:4.3.2-4
+- dhclient-script: amend previous change (#1210984)
+
* Wed Mar 25 2015 Jiri Popelka <jpopelka at redhat.com> - 12:4.3.2-3
- dhclient-script: fix shellcheck.net suggestions
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/dhcp.git/commit/?h=master&id=8568b714e796c41c2ff8b74efe9afaa4f81e0f21
More information about the scm-commits
mailing list