I'm trying to kill bug 1211 which reads:
"if the dhcp-client script (patched for iproute2) only brind down the interface on release, then the released ip-adress is still connected to the interface. an additional 'ip addr del' is necessary."
I took a look at the script and made changes so that the updated file looks like the attached. I would like to get some additional eyes on the changes before I commit it.
The changes I made are as follows. New line numbers refer to the attached file. Old lines refer to the original file *after* the dhcp-3.0.2-iproute2-1.patch has been applied.
1. I deleted several if statements for kernels 2.0 and earlier as I think that no one building LFS/BLFS is really going to be using such an old kernel.
2. s/eup/up/ on new line 150
3. added new line 94 (old line 98)
ip addr del $alias_ip_address dev $interface4. added new line 123 (old line 134)
ip addr del $old_ip_address dev $interface5. added new line 162 (old line 176)
ip addr flush dev $interfaceAlso, does anyone think there should be a comment in the text that if net-tools are installed that the patch is not required?
Any comments will be appreciated.
-- Bruce
#!/bin/bash # dhclient-script for Linux. Dan Halbert, March, 1997. # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
# Updated to iproute2 by Jim Gifford ([EMAIL PROTECTED])
# Notes:
# 0. This script is based on the netbsd script supplied with dhcp-970306.
# 1. This script was modified to work with iproute2
# 2. cidr_convert based on a script by Kevin Fleming ([EMAIL PROTECTED])
make_resolv_conf() {
if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
echo search $new_domain_name >/etc/resolv.conf
chmod 644 /etc/resolv.conf
for nameserver in $new_domain_name_servers; do
echo nameserver $nameserver >>/etc/resolv.conf
done
fi
}
dec2binary()
{
local n=$1
local ret=""
while [ $n != 0 ]; do
ret=$[$n%2]$ret
n=$[$n>>1]
done
echo $ret
}
mask_to_binary()
{
echo `dec2binary $1``dec2binary $2``dec2binary $3``dec2binary $4`
}
cidr_convert()
{
netmask=$1
local mask=`mask_to_binary ${netmask//./ }`
mask=${mask%%0*}
cidr=${#mask}
}
# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
exit_with_hooks() {
exit_status=$1
if [ -f /etc/dhclient-exit-hooks ]; then
. /etc/dhclient-exit-hooks
fi
# probably should do something with exit status of the local script
exit $exit_status
}
# Invoke the local dhcp client enter hooks, if they exist.
if [ -f /etc/dhclient-enter-hooks ]; then
exit_status=0
. /etc/dhclient-enter-hooks
# allow the local script to abort processing of this state
# local script must set exit_status variable to nonzero.
if [ $exit_status -ne 0 ]; then
exit $exit_status
fi
fi
if [ x$new_broadcast_address != x ]; then
new_broadcast_arg="broadcast $new_broadcast_address"
fi
if [ x$old_broadcast_address != x ]; then
old_broadcast_arg="broadcast $old_broadcast_address"
fi
if [ x$new_subnet_mask != x ]; then
cidr_convert $new_subnet_mask
new_subnet_arg="$cidr"
fi
if [ x$old_subnet_mask != x ]; then
cidr_convert $old_subnet_mask
old_subnet_arg="$cidr"
fi
if [ x$reason = xMEDIUM ]; then
# Linux doesn't do mediums (ok, ok, media).
exit_with_hooks 0
fi
if [ x$reason = xPREINIT ]; then
if [ x$alias_ip_address != x ]; then
# Bring down alias interface. Its routes will disappear too.
ip link set $interface down
ip addr del $alias_ip_address dev $interface
fi
ip link set $interface up
# We need to give the kernel some time to get the interface up.
sleep 1
exit_with_hooks 0
fi
if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
exit_with_hooks 0
fi
if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
[ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
current_hostname=`hostname`
if [ x$current_hostname = x ] || \
[ x$current_hostname = x$old_host_name ]; then
if [ x$current_hostname = x ] || \
[ x$new_host_name != x$old_host_name ]; then
hostname $new_host_name
fi
fi
if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
# IP address changed. Bringing down the interface will delete all routes,
# and clear the ARP cache.
ip link set $interface down
ip addr del $old_ip_address dev $interface
fi
if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
[ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
ip link set $interface up
ip addr add $new_ip_address/$new_subnet_arg $new_broadcast_arg \
label $interface dev $interface
# Add a network route to the computed network address.
for router in $new_routers; do
ip route add default via $router
done
fi
make_resolv_conf
exit_with_hooks 0
fi
if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
|| [ x$reason = xSTOP ]; then
if [ x$old_ip_address != x ]; then
# Shut down interface, which will delete routes and clear arp cache.
ip link set $interface down
fi
exit_with_hooks 0
fi
if [ x$reason = xTIMEOUT ]; then
ip link set $interface up
ip addr set $new_ip_address/$new_subnet_arg $new_broadcast_arg \
label $interface dev $interface
set $new_routers
for router in $new_routers; do
ip route add default via $router
done
make_resolv_conf
exit_with_hooks 0
ip link set $interface down
ip addr flush dev $interface
exit_with_hooks 1
fi
exit_with_hooks 0
-- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
