Hello,
Svante Signell, le Tue 01 Mar 2011 20:50:33 +0100, a écrit :
> On Tue, 2011-03-01 at 09:03 +0100, Samuel Thibault wrote:
> > Svante Signell, le Tue 01 Mar 2011 08:50:39 +0100, a écrit :
> > > I have now working scripts dhclient-script.hurd and
> > > dhclient-script.hurd.udeb
> >
> > Ok, good, please post them for review.
>
> Attached below, with debug output by adding set -x to the scripts.
Once again, thanks for your work, it'll be very useful!
Here are some modified version, just a couple of comments:
- I've just commented the aliases part: better do nothing that error out
:)
- I have replaced --down with -A 0.0.0.0. Actually, --down was the
equivalent of Linux' ifconfig down, which got replaced (on my request,
actually) by ifconfig 0, to just disable ipv4 without shutting down
the interface.
- route add can be implemented by using
fsysopts /servers/socket/2 $(showtrans /servers/socket/2) -g $router
as this simply appends the -g option to the existing ones. This
however won't handle multiple interfaces well, but that should be
enough for now.
- I've made a few changes to stick even more to the Linux version.
- About -a vs -A vs --address: don't mix pfinet/fsysopts options with
inetutils-ifconfig options: although they happen to be very similar,
they are not the same, that's why -A wasn't working for fsysopts.
> One thing remains to do: The file
> /etc/dhcp/dhclient-exit-hooks.d/rfc3442-classless-routes should not be
> run on GNU/Hurd (or should be adapted to not use /sbin/route). Now it is
> called but does nothing.
Ok, that'll be fine enough for now.
> It does not make sense to use construct like 10.0.2.15/24, created by
> using ptom (softlink to netcfg) since inetutils does not support this
> synstax. (I downloaded the udebs netcfg_1.60,
Ah, ptom does that, ok, agreed indeed.
> Of course the scripts should be tested in other environments than under
> qemu like I did. And, the udebs within the Debian installer of course.
Yep, I'll do that once you post your patch against the .c code.
> I've spent enough effort on this for now. I'll send a patch as a bug
> report as mentioned earlier. Please test the patches and review the
> modified scripts.
Please post on this list first, I'll upload a package on debian-ports so
people can test it easily before you file the patch to the bug tracker.
Samuel
#!/bin/bash
# dhclient-script for GNU, based on the script for Linux.
# Dan Halbert, March, 1997.
# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
# Modified for Debian. Matt Zimmerman and Eloy Paris, December 2003
# Modified to remove useless tests for antiquated kernel versions that
# this doesn't even work with anyway, and introduces a dependency on /usr
# being mounted, which causes cosmetic errors on hosts that NFS mount /usr
# Andrew Pollock, February 2005
# Modified to work on point-to-point links. Andrew Pollock, June 2005
# Modified to support passing the parameters called with to the
# hooks. Andrew Pollock, November 2005
# Modified to work under GNU/Hurd for isc-dhcp-4.1.1 based on the
# patch by Samuel Thibault for dhcp3. Svante Signell, February 2011.
# The alias handling in here probably still sucks. -mdz
make_resolv_conf() {
if [ "$new_domain_name" -o "$new_domain_name_servers" ]; then
local new_resolv_conf=/etc/resolv.conf.dhclient-new
rm -f $new_resolv_conf
if [ "$new_domain_name" ]; then
echo domain ${new_domain_name%% *} >>$new_resolv_conf
fi
if [ "$new_domain_search" ]; then
#new_domain_search="${new_domain_search% }"
if [ "$new_domain_name" ]; then
domain_in_search_list=""
for domain in "$new_domain_search"; do
if [ "$domain" = "$new_domain_name" ]; then
domain_in_search="Yes"
fi
done
if [ ! "$domain_in_search" ]; then
new_domain_search="$new_domain_name $new_domain_search"
fi
fi
echo "search ${new_domain_search}" >> $new_resolv_conf
elif [ "$new_domain_name" ]; then
echo "search ${new_domain_name}" >> $new_resolv_conf
fi
if [ "$new_domain_name_servers" ]; then
for nameserver in $new_domain_name_servers; do
echo nameserver $nameserver >>$new_resolv_conf
done
else # keep 'old' nameservers
sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p
/etc/resolv.conf >>$new_resolv_conf
fi
chown --reference=/etc/resolv.conf $new_resolv_conf
chmod --reference=/etc/resolv.conf $new_resolv_conf
mv -f $new_resolv_conf /etc/resolv.conf
fi
}
run_hook() {
local script="$1"
local exit_status
shift # discard the first argument, then the rest are the script's
if [ -f $script ]; then
. $script "$@"
fi
if [ -n "$exit_status" ] && [ "$exit_status" -ne 0 ]; then
logger -p daemon.err "$script returned non-zero exit status
$exit_status"
save_exit_status=$exit_status
fi
return $exit_status
}
run_hookdir() {
local dir="$1"
local exit_status
shift # See run_hook
if [ -d "$dir" ]; then
for script in $(run-parts --list $dir); do
run_hook $script "$@" || true
exit_status=$?
done
fi
return $exit_status
}
# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
exit_with_hooks() {
exit_status=$1
# Source the documented exit-hook script, if it exists
if ! run_hook /etc/dhcp/dhclient-exit-hooks "$@"; then
exit_status=$?
fi
# Now run scripts in the Debian-specific directory.
# FIXME: rfc3442-classless-routes should not be run on/adapted to GNU/Hurd
if ! run_hookdir /etc/dhcp/dhclient-exit-hooks.d "$@"; then
exit_status=$?
fi
exit $exit_status
}
set_hostname() {
local current_hostname=$(hostname)
if [ -z "$current_hostname" -o "$current_hostname" = "(none)" ]; then
hostname "$new_host_name"
fi
}
if [ -n "$new_broadcast_address" ]; then
new_broadcast_arg="--broadcast $new_broadcast_address"
fi
if [ -n "$old_broadcast_address" ]; then
old_broadcast_arg="--broadcast $old_broadcast_address"
fi
if [ -n "$new_subnet_mask" ]; then
new_subnet_arg="--netmask $new_subnet_mask"
fi
if [ -n "$old_subnet_mask" ]; then
old_subnet_arg="--netmask $old_subnet_mask"
fi
if [ -n "$alias_subnet_mask" ]; then
alias_subnet_arg="--netmask $alias_subnet_mask"
fi
# The 576 MTU is only used for X.25 and dialup connections
# where the admin wants low latency. Such a low MTU can cause
# problems with UDP traffic, among other things. As such,
# disallow MTUs from 576 and below by default, so that broken
# MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
if [ -n "$new_interface_mtu" ] && [ $new_interface_mtu -gt 576 ]; then
mtu_arg="--mtu $new_interface_mtu"
fi
if [ -n "$IF_METRIC" ]; then
metric_arg="--metric $IF_METRIC" # interfaces(5), "metric" option
fi
# The action starts here
# Invoke the local dhcp client enter hooks, if they exist.
run_hook /etc/dhcp/dhclient-enter-hooks
run_hookdir /etc/dhcp/dhclient-enter-hooks.d
# Execute the operation
case "$reason" in
MEDIUM|ARPCHECK|ARPSEND)
# Do nothing
;;
PREINIT)
# The DHCP client is requesting that an interface be
# configured as required in order to send packets prior to
# receiving an actual address. - dhclient-script(8)
# FIXME: handle multiple interface case.
settrans -afg /servers/socket/2 /hurd/pfinet -i $interface
;;
BOUND|RENEW|REBIND|REBOOT)
set_hostname
if [ -n "$old_ip_address" -a -n "$alias_ip_address" -a \
"$alias_ip_address" != "$old_ip_address" ]; then
# Possible new alias. Remove old alias.
# Alias not supported on GNU/Hurd
:
# FIXME: --down does not work on GNU/Hurd
#inetutils-ifconfig -i $interface:0 --down
fi
if [ -n "$old_ip_address" -a \
"$old_ip_address" != "$new_ip_address" ]; then
# IP address changed. Bringing down the interface will delete all
routes,
# and clear the ARP cache.
inetutils-ifconfig -i $interface -A 0.0.0.0
fi
if [ -z "$old_ip_address" -o "$old_ip_address" != "$new_ip_address" -o \
"$reason" = "BOUND" -o "$reason" = "REBOOT" ]; then
inetutils-ifconfig -i $interface -A $new_ip_address $new_subnet_arg
\
$new_broadcast_arg $mtu_arg
# point to point
# TODO
#if [ "$new_subnet_mask" == "255.255.255.255" ]; then
# for router in $new_routers; do
# route add -host $router dev $interface
# done
#fi
for router in $new_routers; do
fsysopts /servers/socket/2 $(showtrans /servers/socket/2) -g
$router
done
fi
if [ "$new_ip_address" != "$alias_ip_address" -a -n "$alias_ip_address"
];
then
# Alias not supported on GNU/Hurd
:
#inetutils-ifconfig -i $interface:0 -A 0.0.0.0
#inetutils-ifconfig -i $interface:0 -A $alias_ip_address
$alias_subnet_arg
#route add -host $alias_ip_address $interface:0
fi
make_resolv_conf
;;
EXPIRE|FAIL|RELEASE|STOP)
if [ -n "$alias_ip_address" ]; then
# Turn off alias interface.
# Alias not supported on GNU/Hurd
:
# FIXME: --down does not work on GNU/Hurd
#inetutils-ifconfig -i $interface:0 -A 0.0.0.0
fi
if [ -n "$old_ip_address" ]; then
# Shut down interface, which will delete routes and clear arp cache.
inetutils-ifconfig -i $interface -A 0.0.0.0
fi
if [ -n "$alias_ip_address" ]; then
# Alias not supported on GNU/Hurd
:
#inetutils-ifconfig -i $interface:0 -A alias_ip_address
$alias_subnet_arg
#route add -host $alias_ip_address $interface:0
fi
;;
TIMEOUT)
if [ -n "$alias_ip_address" ]; then
# Alias not supported on GNU/Hurd
:
#inetutils-ifconfig -i $interface:0 -A 0.0.0.0
fi
inetutils-ifconfig -i $interface -A $new_ip_address $new_subnet_arg \
$new_broadcast_arg $mtu_arg
set -- $new_routers
first_router="$1"
if [ -z "$first_router" ] || ping -q -c 1 $first_router; then
if [ "$new_ip_address" != "$alias_ip_address" -a \
-n "$alias_ip_address" ]; then
# Alias not supported on GNU/Hurd
:
#inetutils-ifconfig -i $interface:0 -A $alias_ip_address
$alias_subnet_arg
#route add -host $alias_ip_address dev $interface:0
fi
for router in $new_routers; do
#route add default dev $interface gw $router $metric_arg
fsysopts /servers/socket/2 $(showtrans /servers/socket/2) -g
$router
done
make_resolv_conf
else
# Changed from 'inetutils-ifconfig -i $interface inet 0 down' - see
Debian bug #144666
inetutils-ifconfig -i $interface -A 0.0.0.0
exit_with_hooks 2 "$@"
fi
;;
esac
exit_with_hooks 0
#!/bin/sh
set -e
# reduced dhclient-script for the Debian installer
# changes by Joshua Kwan <jo...@triplehelix.org>,
# Bastian Blank <wa...@debian.org>
# dhclient-script for Linux. Dan Halbert, March, 1997.
# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
# Modified for Debian. Matt Zimmerman and Eloy Paris, December 2003
# Adapted the GNU/Linux script to GNU/Hurd, Svante Signell, Frebruary 2011.
make_resolv_conf() {
if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then
local new_resolv_conf=/etc/resolv.conf.dhclient-new
rm -f $new_resolv_conf
if [ -n "$new_domain_name" ]; then
echo "search $new_domain_name" >>$new_resolv_conf
fi
for nameserver in $new_domain_name_servers; do
echo "nameserver $nameserver" >>$new_resolv_conf
done
mv $new_resolv_conf /etc/resolv.conf
fi
}
set_hostname() {
local current_hostname=$(hostname)
if [ -z "$current_hostname" ] || [ "$current_hostname" = "(none)" ]; then
hostname "$new_host_name"
fi
}
if [ -n "$new_subnet_mask" ]; then
new_subnet_arg="-m $new_subnet_mask"
fi
# Execute the operation
case "$reason" in
MEDIUM|ARPCHECK|ARPSEND)
# Do nothing
;;
PREINIT)
settrans -afg /servers/socket/2 /hurd/pfinet -i $interface
# We need to give the kernel some time to get the interface up.
sleep 1
;;
BOUND|RENEW|REBIND|REBOOT)
set_hostname
pfinet_args="-i $interface"
if [ -n "$old_ip_address" ] && \
[ "$old_ip_address" != "$new_ip_address" ]; then
# IP address changed. Bringing down the interface will delete all
routes,
# and clear the ARP cache.
fsysopts /servers/socket/2 $pfinet_args
fi
# TODO: add MTU option to pfinet
#if [ -n "$new_interface_mtu" ]; then
# pfinet_args="$pfinet_args --mtu $new_interface_mtu"
# fsysopts /servers/socket/2 $pfinet_args
#fi
if [ -z "$old_ip_address" ] || [ "$old_ip_address" != "$new_ip_address"
] || \
[ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then
pfinet_args="$pfinet_args -a $new_ip_address $new_subnet_arg"
for router in $new_routers; do
pfinet_args="$pfinet_args -g $router"
done
fsysopts /servers/socket/2 $pfinet_args
fi
make_resolv_conf
# Get the domain name into a file suitable for netcfg to read.
printf "$new_domain_name" > /tmp/domain_name
if [ -n "$new_ntp_servers" ]; then
printf "$new_ntp_servers" > /tmp/dhcp-ntp-servers
fi
;;
EXPIRE|FAIL|RELEASE|STOP)
if [ -n "$old_ip_address" ]; then
# Shut down interface, which will delete routes and clear arp cache.
fsysopts /servers/socket/2 -i $interface
fi
;;
TIMEOUT)
fsysopts /servers/socket/2 -i $interface
;;
esac
exit 0
