Your message dated Sat, 19 Jan 2008 01:17:02 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#461098: fixed in dhcp3 3.1.0-2
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: dhcp3
Severity: wishlist
Tags: patch, d-i

Currently the netcfg package includes a modified dhclient-script in /etc and 
dhcp3-client-udeb symlinks to that. It seems more logical to just include 
our modified script in the dhcp3-client-udeb package instead.

The attached patch takes care of that. The change can be uploaded without 
problem; it will cause no conflicts of breakage in current installer.

Suggested changelog entry:
  * Add reduced dhclient-script for the udeb (previously included in netcfg)

When I prepared the patch I noticed that dhcp3-client has a separate version 
of the script for kfreebsd. D-I currently does not, and I've left it like 
that. It should however be trivial to include a modified script in the 
future if the kfreebsd porters desire that.

Cheers,
FJP

diff -u dhcp3-3.0.6.dfsg/debian/rules dhcp3-3.0.6.dfsg/debian/rules
--- dhcp3-3.0.6.dfsg/debian/rules
+++ dhcp3-3.0.6.dfsg/debian/rules
@@ -101,9 +101,9 @@
 	$(INSTALL_PROGRAM) -m 755 $(DESTDIR)/sbin/dhclient \
 		`pwd`/debian/dhcp3-client-udeb/sbin/
 
-	# udeb needs the os-specific script too
-	#cp `pwd`/debian/tmp/sbin/dhclient-script \
-	#	`pwd`/debian/dhcp3-client-udeb/sbin
+	# udeb needs simplified dhclient script
+	$(INSTALL_FILE) -m 755 `pwd`/debian/dhclient-script.udeb \
+		`pwd`/debian/dhcp3-client-udeb/sbin/dhclient-script
 
 	# Rename binaries so they do not conflict with the binaries in the
 	#	v2 packages.
reverted:
--- dhcp3-3.0.6.dfsg/debian/dhcp3-client-udeb.links
+++ dhcp3-3.0.6.dfsg.orig/debian/dhcp3-client-udeb.links
@@ -1 +0,0 @@
-etc/dhclient-script sbin/dhclient-script
only in patch2:
unchanged:
--- dhcp3-3.0.6.dfsg.orig/debian/dhclient-script.udeb
+++ dhcp3-3.0.6.dfsg/debian/dhclient-script.udeb
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+set -e
+
+# reduced dhclient-script for the Debian installer
+# changes by Joshua Kwan <[EMAIL PROTECTED]>,
+# Bastian Blank <[EMAIL PROTECTED]>
+
+# 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
+
+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=$(cat /proc/sys/kernel/hostname)
+    if [ -z "$current_hostname" ] || [ "$current_hostname" = "(none)" ]; then
+        echo "$new_host_name" > /proc/sys/kernel/hostname
+    fi
+}
+
+if [ -n "$new_subnet_mask" ]; then
+    new_mask="/$(ptom $new_subnet_mask)"
+fi
+if [ -n "$old_subnet_mask" ]; then
+    old_mask="/$(ptom $old_subnet_mask)"
+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
+    
+# Execute the operation
+case "$reason" in
+    MEDIUM|ARPCHECK|ARPSEND)
+        # Do nothing
+        ;;
+    PREINIT)
+	ip link set $interface up
+
+        # We need to give the kernel some time to get the interface up.
+        sleep 1
+        ;;
+    BOUND|RENEW|REBIND|REBOOT)
+
+        set_hostname
+        
+        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.
+            ip addr del $old_ip_address$old_mask $old_broadcast_arg dev $interface
+            ip link set $interface down
+        fi
+
+        if [ -n "$new_interface_mtu" ]; then
+            ip link set $interface mtu $new_interface_mtu || true
+        fi
+
+        if [ -z "$old_ip_address" ] || [ "$old_ip_address" != "$new_ip_address" ] || \
+            [ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then
+
+            ip link set $interface up
+	    ip addr flush dev $interface
+            ip addr add $new_ip_address$new_mask $new_broadcast_arg dev $interface
+
+            for router in $new_routers; do
+                ip route add default via $router
+            done
+        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.
+            ip addr flush dev $interface
+            ip link set $interface down
+        fi
+
+        ;;
+
+    TIMEOUT)
+        ip link set $interface down
+
+        ;;
+esac
+
+exit 0

Attachment: signature.asc
Description: This is a digitally signed message part.


--- End Message ---
--- Begin Message ---
Source: dhcp3
Source-Version: 3.1.0-2

We believe that the bug you reported is fixed in the latest version of
dhcp3, which is due to be installed in the Debian FTP archive:

dhcp3-client-udeb_3.1.0-2_i386.udeb
  to pool/main/d/dhcp3/dhcp3-client-udeb_3.1.0-2_i386.udeb
dhcp3-client_3.1.0-2_i386.deb
  to pool/main/d/dhcp3/dhcp3-client_3.1.0-2_i386.deb
dhcp3-common_3.1.0-2_i386.deb
  to pool/main/d/dhcp3/dhcp3-common_3.1.0-2_i386.deb
dhcp3-dev_3.1.0-2_i386.deb
  to pool/main/d/dhcp3/dhcp3-dev_3.1.0-2_i386.deb
dhcp3-relay_3.1.0-2_i386.deb
  to pool/main/d/dhcp3/dhcp3-relay_3.1.0-2_i386.deb
dhcp3-server_3.1.0-2_i386.deb
  to pool/main/d/dhcp3/dhcp3-server_3.1.0-2_i386.deb
dhcp3_3.1.0-2.diff.gz
  to pool/main/d/dhcp3/dhcp3_3.1.0-2.diff.gz
dhcp3_3.1.0-2.dsc
  to pool/main/d/dhcp3/dhcp3_3.1.0-2.dsc



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Andrew Pollock <[EMAIL PROTECTED]> (supplier of updated dhcp3 package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Fri, 18 Jan 2008 16:35:39 -0800
Source: dhcp3
Binary: dhcp3-client-udeb dhcp3-common dhcp3-relay dhcp3-dev dhcp3-client 
dhcp3-server
Architecture: source i386
Version: 3.1.0-2
Distribution: unstable
Urgency: low
Maintainer: Eloy A. Paris <[EMAIL PROTECTED]>
Changed-By: Andrew Pollock <[EMAIL PROTECTED]>
Description: 
 dhcp3-client - DHCP client
 dhcp3-client-udeb - DHCP Client for debian-installer
 dhcp3-client-udeb - DHCP Client for debian-installer (udeb)
 dhcp3-common - common files used by all the dhcp3* packages
 dhcp3-dev  - API for accessing and modifying the DHCP server and client state
 dhcp3-relay - DHCP relay daemon
 dhcp3-server - DHCP server for automatic IP address assignment
Closes: 313866 399084 461056 461098
Changes: 
 dhcp3 (3.1.0-2) unstable; urgency=low
 .
   * debian/dhclient-script.{linux,kfreebsd}: Applied patch from Yves-Alexis
     Perez to properly remove all instances of \032 in the domain-search option
     not just the first one (closes: #461056)
   * Applied patch from Frans Pop to incorporate the light-weight
     debian-installer dhclient-script into the dhcp3-client-udeb package
     (closes: #461098, #313866)
   * debian/dhclient-script.{linux,kfreebsd}: added fix suggested by Helmar
     Gerloni for static leases without a default gateway option (closes:
     #399084)
Files: 
 b1ded8a1f37be39d192614bf61481d85 762 net important dhcp3_3.1.0-2.dsc
 68ca889c753d8fe3f9d948b00bcb1d82 84552 net important dhcp3_3.1.0-2.diff.gz
 19a0e66aab2e00ae5bef7a30714e0f7c 323804 net optional 
dhcp3-server_3.1.0-2_i386.deb
 a3b90b23e3e970791fd508a4d8c2123c 282972 net important 
dhcp3-common_3.1.0-2_i386.deb
 e59fca57a2dfe767e2119b8666b9f6a6 103418 devel optional 
dhcp3-dev_3.1.0-2_i386.deb
 06c8f44ed0ff8f6828d081424d1f5583 216070 net important 
dhcp3-client_3.1.0-2_i386.deb
 f76d345115c46257edc76052472801c8 162798 debian-installer extra 
dhcp3-client-udeb_3.1.0-2_i386.udeb
 d081fcf4bc67f77b89a34eb0ca566679 98640 net optional 
dhcp3-relay_3.1.0-2_i386.deb
Package-Type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHkUwjIblXXKfZFgIRAlu1AJsGt7wi05A15U2/gg4i57ok0pCfQQCfSnRm
wwQ8NGek9LV8RJfYbT3D8Ac=
=9s/8
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to