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

dhclient-script: fix shellcheck.net suggestions

Browse Source 
https://github.com/koalaman/shellcheck/wiki/SC2068
https://github.com/koalaman/shellcheck/wiki/SC2086
https://github.com/koalaman/shellcheck/wiki/SC2046
This commit is contained in:
Jiri Popelka 2015-03-25 14:09:29 +01:00
parent cccec22272
commit c191e7ecf1
2 changed files with 114 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
dhclient-script
View File

@ -32,7 +32,7 @@
PATH=/bin:/usr/bin:/sbin PATH=/bin:/usr/bin:/sbin
# scripts in dhclient.d/ use $SAVEDIR (#833054) # scripts in dhclient.d/ use $SAVEDIR (#833054)
SAVEDIR=/var/lib/dhclient export SAVEDIR=/var/lib/dhclient
LOGFACILITY="local7" LOGFACILITY="local7"
LOGLEVEL="notice" LOGLEVEL="notice"
@ -41,7 +41,7 @@ ETCDIR="/etc/dhcp"
logmessage() { logmessage() {
msg="${1}" msg="${1}"
logger -p ${LOGFACILITY}.${LOGLEVEL} -t "NET" "dhclient: ${msg}" logger -p "${LOGFACILITY}.${LOGLEVEL}" -t "NET" "dhclient: ${msg}"
} }
eventually_add_hostnames_domain_to_search() { eventually_add_hostnames_domain_to_search() {
@ -57,13 +57,13 @@ eventually_add_hostnames_domain_to_search() {
if need_hostname; then if need_hostname; then
status=1 status=1
if [ -n "${new_ip_address}" ]; then if [ -n "${new_ip_address}" ]; then
eval $(/usr/bin/ipcalc --silent --hostname ${new_ip_address} ; echo "status=$?") eval $(/usr/bin/ipcalc --silent --hostname "${new_ip_address}" ; echo "status=$?")
elif [ -n "${new_ip6_address}" ]; then elif [ -n "${new_ip6_address}" ]; then
eval $(/usr/bin/ipcalc --silent --hostname ${new_ip6_address} ; echo "status=$?") eval $(/usr/bin/ipcalc --silent --hostname "${new_ip6_address}" ; echo "status=$?")
fi fi
if [ ${status} -eq 0 ]; then if [ ${status} -eq 0 ]; then
domain=$(echo $HOSTNAME | cut -s -d "." -f 2-) domain=$(echo "${HOSTNAME}" | cut -s -d "." -f 2-)
fi fi
else else
domain=$(hostname 2>/dev/null | cut -s -d "." -f 2-) domain=$(hostname 2>/dev/null | cut -s -d "." -f 2-)
@ -101,9 +101,9 @@ make_resolv_conf() {
if [ -n "${new_domain_name}" ] || if [ -n "${new_domain_name}" ] ||
[ -n "${new_domain_name_servers}" ] || [ -n "${new_domain_name_servers}" ] ||
[ -n "${new_domain_search}" ]; then [ -n "${new_domain_search}" ]; then
rscf="$(mktemp ${TMPDIR:-/tmp}/XXXXXX)" rscf="$(mktemp "${TMPDIR:-/tmp}/XXXXXX")"
[[ -z "${rscf}" ]] && return [[ -z "${rscf}" ]] && return
echo "; generated by /usr/sbin/dhclient-script" > ${rscf} echo "; generated by /usr/sbin/dhclient-script" > "${rscf}"
if [ -n "${SEARCH}" ]; then if [ -n "${SEARCH}" ]; then
search="${SEARCH}" search="${SEARCH}"
@ -120,28 +120,28 @@ make_resolv_conf() {
fi fi
if [ -n "${search}" ]; then if [ -n "${search}" ]; then
echo "search ${search}" >> $rscf echo "search ${search}" >> "${rscf}"
fi fi
if [ -n "${RES_OPTIONS}" ]; then if [ -n "${RES_OPTIONS}" ]; then
echo "options ${RES_OPTIONS}" >> ${rscf} echo "options ${RES_OPTIONS}" >> "${rscf}"
fi fi
for nameserver in ${new_domain_name_servers} ; do for nameserver in ${new_domain_name_servers} ; do
echo "nameserver ${nameserver}" >> ${rscf} echo "nameserver ${nameserver}" >> "${rscf}"
done done
change_resolv_conf ${rscf} change_resolv_conf "${rscf}"
rm -f ${rscf} rm -f "${rscf}"
if [ -n "${search}" ]; then if [ -n "${search}" ]; then
eventually_add_hostnames_domain_to_search "${search}" eventually_add_hostnames_domain_to_search "${search}"
fi fi
elif [ -n "${new_dhcp6_name_servers}" ] || elif [ -n "${new_dhcp6_name_servers}" ] ||
[ -n "${new_dhcp6_domain_search}" ]; then [ -n "${new_dhcp6_domain_search}" ]; then
rscf="$(mktemp ${TMPDIR:-/tmp}/XXXXXX)" rscf="$(mktemp "${TMPDIR:-/tmp}/XXXXXX")"
[[ -z "${rscf}" ]] && return [[ -z "${rscf}" ]] && return
echo "; generated by /usr/sbin/dhclient-script" > ${rscf} echo "; generated by /usr/sbin/dhclient-script" > "${rscf}"
if [ -n "${SEARCH}" ]; then if [ -n "${SEARCH}" ]; then
search="${SEARCH}" search="${SEARCH}"
@ -152,11 +152,11 @@ make_resolv_conf() {
fi fi
if [ -n "${search}" ]; then if [ -n "${search}" ]; then
echo "search ${search}" >> $rscf echo "search ${search}" >> "${rscf}"
fi fi
if [ -n "${RES_OPTIONS}" ]; then if [ -n "${RES_OPTIONS}" ]; then
echo "options ${RES_OPTIONS}" >> ${rscf} echo "options ${RES_OPTIONS}" >> "${rscf}"
fi fi
shopt -s nocasematch shopt -s nocasematch
@ -169,12 +169,12 @@ make_resolv_conf() {
else else
zone_id= zone_id=
fi fi
echo "nameserver ${nameserver}$zone_id" >> ${rscf} echo "nameserver ${nameserver}$zone_id" >> "${rscf}"
done done
shopt -u nocasematch shopt -u nocasematch
change_resolv_conf ${rscf} change_resolv_conf "${rscf}"
rm -f ${rscf} rm -f "${rscf}"
if [ -n "${search}" ]; then if [ -n "${search}" ]; then
eventually_add_hostnames_domain_to_search "${search}" eventually_add_hostnames_domain_to_search "${search}"
@ -189,7 +189,7 @@ exit_with_hooks() {
. ${ETCDIR}/dhclient-exit-hooks . ${ETCDIR}/dhclient-exit-hooks
fi fi
exit ${exit_status} exit "${exit_status}"
} }
quad2num() { quad2num() {
@ -204,15 +204,15 @@ quad2num() {
} }
ip2num() { ip2num() {
IFS="." quad2num ${1} IFS="." quad2num "${1}"
} }
num2ip() { num2ip() {
let n="${1}" let n="${1}"
let o1="(n >> 24) & 0xff" let o1="(${n} >> 24) & 0xff"
let o2="(n >> 16) & 0xff" let o2="(${n} >> 16) & 0xff"
let o3="(n >> 8) & 0xff" let o3="(${n} >> 8) & 0xff"
let o4="n & 0xff" let o4="${n} & 0xff"
echo "${o1}.${o2}.${o3}.${o4}" echo "${o1}.${o2}.${o3}.${o4}"
} }
@ -223,9 +223,9 @@ get_network_address() {
if [ -n "${ip}" -a -n "${nm}" ]; then if [ -n "${ip}" -a -n "${nm}" ]; then
if [[ "${nm}" = *.* ]]; then if [[ "${nm}" = *.* ]]; then
ipcalc -s -n ${ip} ${nm} | cut -d '=' -f 2 ipcalc -s -n "${ip}" "${nm}" | cut -d '=' -f 2
else else
ipcalc -s -n ${ip}/${nm} | cut -d '=' -f 2 ipcalc -s -n "${ip}/${nm}" | cut -d '=' -f 2
fi fi
fi fi
} }
@ -236,12 +236,12 @@ get_prefix() {
nm="${2}" nm="${2}"
if [ -n "${ip}" -a -n "${nm}" ]; then if [ -n "${ip}" -a -n "${nm}" ]; then
ipcalc -s -p ${ip} ${nm} | cut -d '=' -f 2 ipcalc -s -p "${ip}" "${nm}" | cut -d '=' -f 2
fi fi
} }
class_bits() { class_bits() {
let ip=$(IFS='.' ip2num $1) let ip=$(IFS='.' ip2num "${1}")
let bits=32 let bits=32
let mask='255' let mask='255'
for ((i=0; i <= 3; i++, 'mask<<=8')); do for ((i=0; i <= 3; i++, 'mask<<=8')); do
@ -258,14 +258,14 @@ class_bits() {
is_router_reachable() { is_router_reachable() {
# handle DHCP servers that give us a router not on our subnet # handle DHCP servers that give us a router not on our subnet
router="${1}" router="${1}"
routersubnet="$(get_network_address ${router} ${new_subnet_mask})" routersubnet="$(get_network_address "${router}" "${new_subnet_mask}")"
mysubnet="$(get_network_address ${new_ip_address} ${new_subnet_mask})" mysubnet="$(get_network_address "${new_ip_address}" "${new_subnet_mask}")"
if [ ! "${routersubnet}" = "${mysubnet}" ]; then if [ ! "${routersubnet}" = "${mysubnet}" ]; then
# TODO: This function should not have side effects such as adding or # TODO: This function should not have side effects such as adding or
# removing routes. Can this be done with "ip route get" or similar # removing routes. Can this be done with "ip route get" or similar
# instead? Are there cases that rely on this route being created here? # instead? Are there cases that rely on this route being created here?
ip -4 route replace ${router}/32 dev ${interface} ip -4 route replace "${router}/32" dev "${interface}"
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
logmessage "failed to create host route for ${router}" logmessage "failed to create host route for ${router}"
return 1 return 1
@ -278,12 +278,12 @@ is_router_reachable() {
add_default_gateway() { add_default_gateway() {
router="${1}" router="${1}"
if is_router_reachable ${router} ; then if is_router_reachable "${router}" ; then
metric="" metric=""
if [ $# -gt 1 ] && [ ${2} -gt 0 ]; then if [ $# -gt 1 ] && [ "${2}" -gt 0 ]; then
metric="metric ${2}" metric="metric ${2}"
fi fi
ip -4 route replace default via ${router} dev ${interface} ${metric} ip -4 route replace default via "${router}" dev "${interface}" "${metric}"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
logmessage "failed to create default route: ${router} dev ${interface} ${metric}" logmessage "failed to create default route: ${router} dev ${interface} ${metric}"
return 1 return 1
@ -299,10 +299,10 @@ execute_client_side_configuration_scripts() {
# execute any additional client side configuration scripts we have # execute any additional client side configuration scripts we have
if [ "${1}" == "config" ] || [ "${1}" == "restore" ]; then if [ "${1}" == "config" ] || [ "${1}" == "restore" ]; then
for f in ${ETCDIR}/dhclient.d/*.sh ; do for f in ${ETCDIR}/dhclient.d/*.sh ; do
if [ -x ${f} ]; then if [ -x "${f}" ]; then
subsystem="${f%.sh}" subsystem="${f%.sh}"
subsystem="${subsystem##*/}" subsystem="${subsystem##*/}"
. ${f} . "${f}"
"${subsystem}_${1}" "${subsystem}_${1}"
fi fi
done done
@ -312,17 +312,17 @@ execute_client_side_configuration_scripts() {
flush_dev() { flush_dev() {
# Instead of bringing the interface down (#574568) # Instead of bringing the interface down (#574568)
# explicitly clear ARP cache and flush all addresses & routes. # explicitly clear ARP cache and flush all addresses & routes.
ip -4 addr flush dev ${1} >/dev/null 2>&1 ip -4 addr flush dev "${1}" >/dev/null 2>&1
ip -4 route flush dev ${1} >/dev/null 2>&1 ip -4 route flush dev "${1}" >/dev/null 2>&1
ip -4 neigh flush dev ${1} >/dev/null 2>&1 ip -4 neigh flush dev "${1}" >/dev/null 2>&1
} }
remove_old_addr() { remove_old_addr() {
if [ -n "${old_ip_address}" ]; then if [ -n "${old_ip_address}" ]; then
if [ -n "${old_prefix}" ]; then if [ -n "${old_prefix}" ]; then
ip -4 addr del ${old_ip_address}/${old_prefix} dev ${interface} >/dev/null 2>&1 ip -4 addr del "${old_ip_address}/${old_prefix}" dev "${interface}" >/dev/null 2>&1
else else
ip -4 addr del ${old_ip_address} dev ${interface} >/dev/null 2>&1 ip -4 addr del "${old_ip_address}" dev "${interface}" >/dev/null 2>&1
fi fi
fi fi
} }
@ -331,21 +331,21 @@ dhconfig() {
if [ -n "${old_ip_address}" ] && [ -n "${alias_ip_address}" ] && if [ -n "${old_ip_address}" ] && [ -n "${alias_ip_address}" ] &&
[ ! "${alias_ip_address}" = "${old_ip_address}" ]; then [ ! "${alias_ip_address}" = "${old_ip_address}" ]; then
# possible new alias, remove old alias first # possible new alias, remove old alias first
ip -4 addr del ${old_ip_address} dev ${interface} label ${interface}:0 ip -4 addr del "${old_ip_address}" dev "${interface}" label "${interface}:0"
fi fi
if [ -n "${old_ip_address}" ] && if [ -n "${old_ip_address}" ] &&
[ ! "${old_ip_address}" = "${new_ip_address}" ]; then [ ! "${old_ip_address}" = "${new_ip_address}" ]; then
# IP address changed. Delete all routes, and clear the ARP cache. # IP address changed. Delete all routes, and clear the ARP cache.
flush_dev ${interface} flush_dev "${interface}"
fi fi
# make sure the interface is up # make sure the interface is up
ip link set dev ${interface} up ip link set dev "${interface}" up
# replace = add if it doesn't exist or override (update lifetimes) if it's there # replace = add if it doesn't exist or override (update lifetimes) if it's there
ip -4 addr replace ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface} \ ip -4 addr replace "${new_ip_address}/${new_prefix}" broadcast "${new_broadcast_address}" dev "${interface}" \
valid_lft ${new_dhcp_lease_time} preferred_lft ${new_dhcp_lease_time} >/dev/null 2>&1 valid_lft "${new_dhcp_lease_time}" preferred_lft "${new_dhcp_lease_time}" >/dev/null 2>&1
if [ "${reason}" = "BOUND" ] || [ "${reason}" = "REBOOT" ] || if [ "${reason}" = "BOUND" ] || [ "${reason}" = "REBOOT" ] ||
[ ! "${old_ip_address}" = "${new_ip_address}" ] || [ ! "${old_ip_address}" = "${new_ip_address}" ] ||
@ -360,8 +360,8 @@ dhconfig() {
# problems with UDP traffic, among other things. As such, # problems with UDP traffic, among other things. As such,
# disallow MTUs from 576 and below by default, so that broken # disallow MTUs from 576 and below by default, so that broken
# MTUs are ignored, but higher stuff is allowed (1492, 1500, etc). # MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
if [ -n "${new_interface_mtu}" ] && [ ${new_interface_mtu} -gt 576 ]; then if [ -n "${new_interface_mtu}" ] && [ "${new_interface_mtu}" -gt 576 ]; then
ip link set dev ${interface} mtu ${new_interface_mtu} ip link set dev "${interface}" mtu "${new_interface_mtu}"
fi fi
# static routes # static routes
@ -377,7 +377,7 @@ dhconfig() {
for((i=0; i<${#static_routes[@]}; i+=2)); do for((i=0; i<${#static_routes[@]}; i+=2)); do
target=${static_routes[$i]} target=${static_routes[$i]}
if [ -n "${new_classless_static_routes}" ]; then if [ -n "${new_classless_static_routes}" ]; then
if [ ${target} = "0" ]; then if [ "${target}" = "0" ]; then
# If the DHCP server returns both a Classless Static Routes option and # If the DHCP server returns both a Classless Static Routes option and
# a Router option, the DHCP client MUST ignore the Router option. (RFC3442) # a Router option, the DHCP client MUST ignore the Router option. (RFC3442)
new_routers="" new_routers=""
@ -395,10 +395,10 @@ dhconfig() {
# Client MUST zero any bits in the subnet number where the corresponding bit in the mask is zero. # Client MUST zero any bits in the subnet number where the corresponding bit in the mask is zero.
# In other words, the subnet number installed in the routing table is the logical AND of # In other words, the subnet number installed in the routing table is the logical AND of
# the subnet number and subnet mask given in the Classless Static Routes option. (RFC3442) # the subnet number and subnet mask given in the Classless Static Routes option. (RFC3442)
target="$(get_network_address ${target} ${prefix})" target="$(get_network_address "${target}" "${prefix}")"
fi fi
else else
prefix=$(class_bits ${target}) prefix=$(class_bits "${target}")
fi fi
gateway=${static_routes[$i+1]} gateway=${static_routes[$i+1]}
@ -408,14 +408,14 @@ dhconfig() {
valid_gateway=0 valid_gateway=0
scope='scope link' scope='scope link'
else else
is_router_reachable ${gateway} is_router_reachable "${gateway}"
valid_gateway=$? valid_gateway=$?
scope='' scope=''
fi fi
if [ ${valid_gateway} -eq 0 ]; then if [ "${valid_gateway}" -eq 0 ]; then
metric='' metric=''
for t in ${route_targets[@]}; do for t in "${route_targets[@]}"; do
if [ ${t} = ${target} ]; then if [ "${t}" = "${target}" ]; then
if [ -z "${metric}" ]; then if [ -z "${metric}" ]; then
metric=1 metric=1
else else
@ -428,7 +428,7 @@ dhconfig() {
metric="metric ${metric}" metric="metric ${metric}"
fi 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 if [ $? -ne 0 ]; then
logmessage "failed to create static route: ${target}/${prefix} via ${gateway} dev ${interface} ${metric}" logmessage "failed to create static route: ${target}/${prefix} via ${gateway} dev ${interface} ${metric}"
@ -442,8 +442,8 @@ dhconfig() {
# gateways # gateways
if [[ ( "${DEFROUTE}" != "no" ) && if [[ ( "${DEFROUTE}" != "no" ) &&
(( -z "${GATEWAYDEV}" ) || ( "${GATEWAYDEV}" = "${interface}" )) ]]; then (( -z "${GATEWAYDEV}" ) || ( "${GATEWAYDEV}" = "${interface}" )) ]]; then
if [[ ( -z "$GATEWAY" ) || if [[ ( -z "${GATEWAY}" ) ||
(( -n "$DHCLIENT_IGNORE_GATEWAY" ) && ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* )) ]]; then (( -n "${DHCLIENT_IGNORE_GATEWAY}" ) && ( "${DHCLIENT_IGNORE_GATEWAY}" = [Yy]* )) ]]; then
metric="${METRIC:-}" metric="${METRIC:-}"
let i="${METRIC:-0}" let i="${METRIC:-0}"
default_routers=() default_routers=()
@ -451,7 +451,7 @@ dhconfig() {
for router in ${new_routers} ; do for router in ${new_routers} ; do
added_router=- added_router=-
for r in ${default_routers[@]} ; do for r in "${default_routers[@]}" ; do
if [ "${r}" = "${router}" ]; then if [ "${r}" = "${router}" ]; then
added_router=1 added_router=1
fi fi
@ -459,23 +459,23 @@ dhconfig() {
if [ -z "${router}" ] || if [ -z "${router}" ] ||
[ "${added_router}" = "1" ] || [ "${added_router}" = "1" ] ||
[ $(IFS=. ip2num ${router}) -le 0 ] || [ "$(IFS=. ip2num ${router})" -le 0 ] ||
[[ ( "${router}" = "${new_broadcast_address}" ) && [[ ( "${router}" = "${new_broadcast_address}" ) &&
( "${new_subnet_mask}" != "255.255.255.255" ) ]]; then ( "${new_subnet_mask}" != "255.255.255.255" ) ]]; then
continue continue
fi fi
default_routers=(${default_routers[@]} ${router}) default_routers=(${default_routers[@]} ${router})
add_default_gateway ${router} ${metric} add_default_gateway "${router}" "${metric}"
let i=i+1 let i=i+1
metric=${i} metric=${i}
done done
elif [ -n "${GATEWAY}" ]; then elif [ -n "${GATEWAY}" ]; then
routersubnet=$(get_network_address ${GATEWAY} ${new_subnet_mask}) routersubnet=$(get_network_address "${GATEWAY}" "${new_subnet_mask}")
mysubnet=$(get_network_address ${new_ip_address} ${new_subnet_mask}) mysubnet=$(get_network_address "${new_ip_address}" "${new_subnet_mask}")
if [ "${routersubnet}" = "${mysubnet}" ]; then if [ "${routersubnet}" = "${mysubnet}" ]; then
ip -4 route replace default via ${GATEWAY} dev ${interface} ip -4 route replace default via "${GATEWAY}" dev "${interface}"
fi fi
fi fi
fi fi
@ -484,9 +484,9 @@ dhconfig() {
if [ ! "${new_ip_address}" = "${alias_ip_address}" ] && if [ ! "${new_ip_address}" = "${alias_ip_address}" ] &&
[ -n "${alias_ip_address}" ]; then [ -n "${alias_ip_address}" ]; then
# Reset the alias address (fix: this should really only do this on changes) # Reset the alias address (fix: this should really only do this on changes)
ip -4 addr flush dev ${interface} label ${interface}:0 >/dev/null 2>&1 ip -4 addr flush dev "${interface}" label "${interface}:0" >/dev/null 2>&1
ip -4 addr replace ${alias_ip_address}/${alias_prefix} broadcast ${alias_broadcast_address} dev ${interface} label ${interface}:0 ip -4 addr replace "${alias_ip_address}/${alias_prefix}" broadcast "${alias_broadcast_address}" dev "${interface}" label "${interface}:0"
ip -4 route replace ${alias_ip_address}/32 dev ${interface} ip -4 route replace "${alias_ip_address}/32" dev "${interface}"
fi fi
# After dhclient brings an interface UP with a new IP address, subnet mask, # After dhclient brings an interface UP with a new IP address, subnet mask,
@ -499,8 +499,8 @@ dhconfig() {
[ ! "${old_routers}" = "${new_routers}" ] || [ ! "${old_routers}" = "${new_routers}" ] ||
[ ! "${old_interface_mtu}" = "${new_interface_mtu}" ]; then [ ! "${old_interface_mtu}" = "${new_interface_mtu}" ]; then
if [ -x ${ETCDIR}/dhclient-${interface}-up-hooks ]; then if [ -x "${ETCDIR}/dhclient-${interface}-up-hooks" ]; then
. ${ETCDIR}/dhclient-${interface}-up-hooks . "${ETCDIR}/dhclient-${interface}-up-hooks"
elif [ -x ${ETCDIR}/dhclient-up-hooks ]; then elif [ -x ${ETCDIR}/dhclient-up-hooks ]; then
. ${ETCDIR}/dhclient-up-hooks . ${ETCDIR}/dhclient-up-hooks
fi fi
@ -509,7 +509,7 @@ dhconfig() {
make_resolv_conf make_resolv_conf
if [ -n "${new_host_name}" ] && need_hostname; then if [ -n "${new_host_name}" ] && need_hostname; then
hostname ${new_host_name} || echo "See -nc option in dhclient(8) man page." hostname "${new_host_name}" || echo "See -nc option in dhclient(8) man page."
fi fi
if [[ ( "${DHCP_TIME_OFFSET_SETS_TIMEZONE}" = [yY1]* ) && if [[ ( "${DHCP_TIME_OFFSET_SETS_TIMEZONE}" = [yY1]* ) &&
@ -527,8 +527,8 @@ dhconfig() {
fi fi
tzfile=/usr/share/zoneinfo/Etc/GMT$(printf '%+d' ${hoursWest}) tzfile=/usr/share/zoneinfo/Etc/GMT$(printf '%+d' ${hoursWest})
if [ -e ${tzfile} ]; then if [ -e "${tzfile}" ]; then
cp -fp ${tzfile} /etc/localtime cp -fp "${tzfile}" /etc/localtime
touch /etc/localtime touch /etc/localtime
fi fi
fi fi
@ -541,17 +541,17 @@ dhconfig() {
# the addresses in any IAs it receives in the Reply message before # the addresses in any IAs it receives in the Reply message before
# using that address for traffic. # using that address for traffic.
add_ipv6_addr_with_DAD() { add_ipv6_addr_with_DAD() {
ip -6 addr replace ${new_ip6_address}/${new_ip6_prefixlen} \ ip -6 addr replace "${new_ip6_address}/${new_ip6_prefixlen}" \
dev ${interface} scope global valid_lft ${new_max_life} \ dev "${interface}" scope global valid_lft "${new_max_life}" \
preferred_lft ${new_preferred_life} preferred_lft "${new_preferred_life}"
# repeatedly test whether newly added address passed # repeatedly test whether newly added address passed
# duplicate address detection (DAD) # duplicate address detection (DAD)
for i in $(seq 5); do for i in $(seq 5); do
sleep 1 # give the DAD some time sleep 1 # give the DAD some time
addr=$(ip -6 addr show dev ${interface} \ addr=$(ip -6 addr show dev "${interface}" \
| grep ${new_ip6_address}/${new_ip6_prefixlen}) | grep "${new_ip6_address}/${new_ip6_prefixlen}")
# tentative flag == DAD is still not complete # tentative flag == DAD is still not complete
tentative=$(echo "${addr}" | grep tentative) tentative=$(echo "${addr}" | grep tentative)
@ -560,7 +560,7 @@ add_ipv6_addr_with_DAD() {
if [ -n "${dadfailed}" ] ; then if [ -n "${dadfailed}" ] ; then
# address was added with valid_lft/preferred_lft 'forever', remove it # address was added with valid_lft/preferred_lft 'forever', remove it
ip -6 addr del ${new_ip6_address}/${new_ip6_prefixlen} dev ${interface} ip -6 addr del "${new_ip6_address}/${new_ip6_prefixlen}" dev "${interface}"
exit_with_hooks 3 exit_with_hooks 3
fi fi
if [ -z "${tentative}" ] ; then if [ -z "${tentative}" ] ; then
@ -579,7 +579,7 @@ add_ipv6_addr_with_DAD() {
dh6config() { dh6config() {
if [ -n "${old_ip6_prefix}" ] || if [ -n "${old_ip6_prefix}" ] ||
[ -n "${new_ip6_prefix}" ]; then [ -n "${new_ip6_prefix}" ]; then
echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix} echo "Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}"
exit_with_hooks 0 exit_with_hooks 0
fi fi
@ -599,7 +599,7 @@ dh6config() {
if [[ -n "${new_ip6_address}" ]] && if [[ -n "${new_ip6_address}" ]] &&
[[ -n "${new_ip6_prefixlen}" ]]; then [[ -n "${new_ip6_prefixlen}" ]]; then
if [[ ! "${new_ip6_address}" = "${old_ip6_address}" ]]; then if [[ ! "${new_ip6_address}" = "${old_ip6_address}" ]]; then
[[ -n "${old_ip6_address}" ]] && ip -6 addr del ${old_ip6_address} dev ${interface} [[ -n "${old_ip6_address}" ]] && ip -6 addr del "${old_ip6_address}" dev "${interface}"
fi fi
# call it even if new_ip6_address = old_ip6_address to update lifetimes # call it even if new_ip6_address = old_ip6_address to update lifetimes
add_ipv6_addr_with_DAD add_ipv6_addr_with_DAD
@ -616,8 +616,8 @@ dh6config() {
exit_with_hooks 2 exit_with_hooks 2
fi fi
ip -6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \ ip -6 addr change "${new_ip6_address}/${new_ip6_prefixlen}" \
dev ${interface} scope global preferred_lft 0 dev "${interface}" scope global preferred_lft 0
;; ;;
esac esac
@ -663,12 +663,12 @@ fi
cd /etc/sysconfig/network-scripts cd /etc/sysconfig/network-scripts
CONFIG="${interface}" CONFIG="${interface}"
need_config ${CONFIG} need_config "${CONFIG}"
source_config >/dev/null 2>&1 source_config >/dev/null 2>&1
new_prefix="$(get_prefix ${new_ip_address} ${new_subnet_mask})" new_prefix="$(get_prefix "${new_ip_address}" "${new_subnet_mask}")"
old_prefix="$(get_prefix ${old_ip_address} ${old_subnet_mask})" old_prefix="$(get_prefix "${old_ip_address}" "${old_subnet_mask}")"
alias_prefix="$(get_prefix ${alias_ip_address} ${alias_subnet_mask})" alias_prefix="$(get_prefix "${alias_ip_address}" "${alias_subnet_mask}")"
case "${reason}" in case "${reason}" in
MEDIUM|ARPCHECK|ARPSEND) MEDIUM|ARPCHECK|ARPSEND)
@ -679,16 +679,16 @@ case "${reason}" in
PREINIT) PREINIT)
if [ -n "${alias_ip_address}" ]; then if [ -n "${alias_ip_address}" ]; then
# Flush alias, its routes will disappear too. # Flush alias, its routes will disappear too.
ip -4 addr flush dev ${interface} label ${interface}:0 >/dev/null 2>&1 ip -4 addr flush dev "${interface}" label "${interface}:0" >/dev/null 2>&1
fi fi
# upstream dhclient-script removes (ifconfig $interface 0 up) old adresses in PREINIT, # upstream dhclient-script removes (ifconfig $interface 0 up) old adresses in PREINIT,
# but we sometimes (#125298) need (for iSCSI/nfs root to have a dhcp interface) to keep the existing ip # but we sometimes (#125298) need (for iSCSI/nfs root to have a dhcp interface) to keep the existing ip
# flush_dev ${interface} # flush_dev ${interface}
ip link set dev ${interface} up ip link set dev "${interface}" up
if [ -n "${DHCLIENT_DELAY}" ] && [ ${DHCLIENT_DELAY} -gt 0 ]; then if [ -n "${DHCLIENT_DELAY}" ] && [ "${DHCLIENT_DELAY}" -gt 0 ]; then
# We need to give the kernel some time to get the interface up. # We need to give the kernel some time to get the interface up.
sleep ${DHCLIENT_DELAY} sleep "${DHCLIENT_DELAY}"
fi fi
exit_with_hooks 0 exit_with_hooks 0
@ -696,14 +696,14 @@ case "${reason}" in
PREINIT6) PREINIT6)
# ensure interface is up # ensure interface is up
ip link set dev ${interface} up ip link set dev "${interface}" up
# remove any stale addresses from aborted clients # remove any stale addresses from aborted clients
ip -6 addr flush dev ${interface} scope global permanent ip -6 addr flush dev "${interface}" scope global permanent
# we need a link-local address to be ready (not tentative) # we need a link-local address to be ready (not tentative)
for i in $(seq 50); do for i in $(seq 50); do
linklocal=$(ip -6 addr show dev ${interface} scope link) linklocal=$(ip -6 addr show dev "${interface}" scope link)
# tentative flag means DAD is still not complete # tentative flag means DAD is still not complete
tentative=$(echo "${linklocal}" | grep tentative) tentative=$(echo "${linklocal}" | grep tentative)
[[ -n "${linklocal}" && -z "${tentative}" ]] && exit_with_hooks 0 [[ -n "${linklocal}" && -z "${tentative}" ]] && exit_with_hooks 0
@ -717,11 +717,11 @@ case "${reason}" in
if [ -z "${interface}" ] || [ -z "${new_ip_address}" ]; then if [ -z "${interface}" ] || [ -z "${new_ip_address}" ]; then
exit_with_hooks 2 exit_with_hooks 2
fi fi
if arping -D -q -c2 -I ${interface} ${new_ip_address}; then if arping -D -q -c2 -I "${interface}" "${new_ip_address}"; then
dhconfig dhconfig
exit_with_hooks 0 exit_with_hooks 0
else # DAD failed, i.e. address is already in use else # DAD failed, i.e. address is already in use
ARP_REPLY=$(arping -D -c2 -I ${interface} ${new_ip_address} | grep reply | awk '{print toupper($5)}' | cut -d "[" -f2 | cut -d "]" -f1) ARP_REPLY=$(arping -D -c2 -I "${interface}" "${new_ip_address}" | grep reply | awk '{print toupper($5)}' | cut -d "[" -f2 | cut -d "]" -f1)
OUR_MACS=$(ip link show | grep link | awk '{print toupper($2)}' | uniq) OUR_MACS=$(ip link show | grep link | awk '{print toupper($2)}' | uniq)
if [[ "${OUR_MACS}" = *"${ARP_REPLY}"* ]]; then if [[ "${OUR_MACS}" = *"${ARP_REPLY}"* ]]; then
# the reply can come from our system, that's OK (#1116004#c33) # the reply can come from our system, that's OK (#1116004#c33)
@ -743,13 +743,13 @@ case "${reason}" in
exit_with_hooks 2 exit_with_hooks 2
fi fi
ip -6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \ ip -6 addr del "${old_ip6_address}/${old_ip6_prefixlen}" \
dev ${interface} dev "${interface}"
execute_client_side_configuration_scripts "restore" execute_client_side_configuration_scripts "restore"
if [ -x ${ETCDIR}/dhclient-${interface}-down-hooks ]; then if [ -x "${ETCDIR}/dhclient-${interface}-down-hooks" ]; then
. ${ETCDIR}/dhclient-${interface}-down-hooks . "${ETCDIR}/dhclient-${interface}-down-hooks"
elif [ -x ${ETCDIR}/dhclient-down-hooks ]; then elif [ -x ${ETCDIR}/dhclient-down-hooks ]; then
. ${ETCDIR}/dhclient-down-hooks . ${ETCDIR}/dhclient-down-hooks
fi fi
@ -760,15 +760,15 @@ case "${reason}" in
EXPIRE|FAIL|RELEASE|STOP) EXPIRE|FAIL|RELEASE|STOP)
execute_client_side_configuration_scripts "restore" execute_client_side_configuration_scripts "restore"
if [ -x ${ETCDIR}/dhclient-${interface}-down-hooks ]; then if [ -x "${ETCDIR}/dhclient-${interface}-down-hooks" ]; then
. ${ETCDIR}/dhclient-${interface}-down-hooks . "${ETCDIR}/dhclient-${interface}-down-hooks"
elif [ -x ${ETCDIR}/dhclient-down-hooks ]; then elif [ -x ${ETCDIR}/dhclient-down-hooks ]; then
. ${ETCDIR}/dhclient-down-hooks . ${ETCDIR}/dhclient-down-hooks
fi fi
if [ -n "${alias_ip_address}" ]; then if [ -n "${alias_ip_address}" ]; then
# Flush alias # Flush alias
ip -4 addr flush dev ${interface} label ${interface}:0 >/dev/null 2>&1 ip -4 addr flush dev "${interface}" label "${interface}:0" >/dev/null 2>&1
fi fi
# upstream script sets interface down here, # upstream script sets interface down here,
@ -777,8 +777,8 @@ case "${reason}" in
remove_old_addr remove_old_addr
if [ -n "${alias_ip_address}" ]; then if [ -n "${alias_ip_address}" ]; then
ip -4 addr replace ${alias_ip_address}/${alias_prefix} broadcast ${alias_broadcast_address} dev ${interface} label ${interface}:0 ip -4 addr replace "${alias_ip_address}/${alias_prefix}" broadcast "${alias_broadcast_address}" dev "${interface}" label "${interface}:0"
ip -4 route replace ${alias_ip_address}/32 dev ${interface} ip -4 route replace "${alias_ip_address}/32" dev "${interface}"
fi fi
exit_with_hooks 0 exit_with_hooks 0
@ -787,15 +787,15 @@ case "${reason}" in
TIMEOUT) TIMEOUT)
if [ -n "${new_routers}" ]; then if [ -n "${new_routers}" ]; then
if [ -n "${alias_ip_address}" ]; then if [ -n "${alias_ip_address}" ]; then
ip -4 addr flush dev ${interface} label ${interface}:0 >/dev/null 2>&1 ip -4 addr flush dev "${interface}" label "${interface}:0" >/dev/null 2>&1
fi fi
ip -4 addr replace ${new_ip_address}/${new_prefix} \ ip -4 addr replace "${new_ip_address}/${new_prefix}" \
broadcast ${new_broadcast_address} dev ${interface} \ broadcast "${new_broadcast_address}" dev "${interface}" \
valid_lft ${new_dhcp_lease_time} preferred_lft ${new_dhcp_lease_time} valid_lft "${new_dhcp_lease_time}" preferred_lft "${new_dhcp_lease_time}"
set ${new_routers} set ${new_routers}
if ping -q -c 1 -w 10 -I ${interface} ${1}; then if ping -q -c 1 -w 10 -I "${interface}" "${1}"; then
dhconfig dhconfig
exit_with_hooks 0 exit_with_hooks 0
fi fi

5
dhcp.spec
View File

@ -18,7 +18,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.3.2 Version: 4.3.2
Release: 2%{?dist} Release: 3%{?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.
@ -675,6 +675,9 @@ done
%doc doc/html/ %doc doc/html/
%changelog %changelog
* Wed Mar 25 2015 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.2-3
- dhclient-script: fix shellcheck.net suggestions
* Fri Mar 13 2015 Tomas Hozza <thozza@redhat.com> - 12:4.3.2-2 * Fri Mar 13 2015 Tomas Hozza <thozza@redhat.com> - 12:4.3.2-2
- rebuild against bind99 9.9.7 package - rebuild against bind99 9.9.7 package