OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=23

dhcp-3.1.1-dhclient-script.dif

@@ -1,5 +1,5 @@
 --- client/dhclient-script.8
-+++ client/dhclient-script.8	2008/11/11 09:06:47
++++ client/dhclient-script.8	2009/01/19 14:56:42
 @@ -45,9 +45,10 @@
  This script is not meant to be customized by the end user.  If local
  customizations are needed, they should be possible using the enter and
@@ -72,7 +72,7 @@
  .B dhclient-script(8)
  has been written for Internet Systems Consortium
 --- client/scripts/linux
-+++ client/scripts/linux	2008/11/11 09:06:54
++++ client/scripts/linux	2009/01/19 14:56:58
 @@ -22,25 +22,97 @@
  # 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
  # of the $1 in its args.
@@ -178,7 +178,18 @@
  
  # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
  exit_with_hooks() {
-@@ -97,7 +169,7 @@
+@@ -83,6 +155,10 @@
+ if [ x$alias_subnet_mask != x ]; then
+   alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ $(($new_interface_mtu)) -lt 576 ] ; then
++  # 68 is the minimal legal value, but 576 the real life minimum
++  unset new_interface_mtu
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   # Linux doesn't do mediums (ok, ok, media).
+@@ -97,7 +173,7 @@
    if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
     then
      ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
@@ -187,7 +198,7 @@
      # Add route to make broadcast work. Do not omit netmask.
      route add default dev $interface netmask 0.0.0.0
    else
-@@ -116,39 +188,58 @@
+@@ -116,39 +192,59 @@
    
  if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
     [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
@@ -218,7 +229,8 @@
  
      ifconfig $interface inet $new_ip_address $new_subnet_arg \
 -							$new_broadcast_arg
-+                             $new_broadcast_arg
++                             $new_broadcast_arg \
++                             ${new_interface_mtu:+mtu "$new_interface_mtu"}
      # Add a network route to the computed network address.
      if [ $relmajor -lt 2 ] || \
 -		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
@@ -262,7 +274,7 @@
    fi
    if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
     then
-@@ -156,7 +247,41 @@
+@@ -156,7 +252,41 @@
      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
      route add -host $alias_ip_address $interface:0
    fi
@@ -305,7 +317,7 @@
    exit_with_hooks 0
  fi
  
-@@ -168,7 +293,7 @@
+@@ -168,7 +298,7 @@
    fi
    if [ x$old_ip_address != x ]; then
      # Shut down interface, which will delete routes and clear arp cache.
@@ -314,7 +326,7 @@
    fi
    if [ x$alias_ip_address != x ]; then
      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-@@ -182,27 +307,37 @@
+@@ -182,27 +312,37 @@
      ifconfig $interface:0- inet 0
    fi
    ifconfig $interface inet $new_ip_address $new_subnet_arg \

dhcp.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 19 15:58:38 CET 2009 - mt@suse.de
+
+- Fixed dhclient-script to apply a dhcp provided MTU (bnc#467358).
+
 -------------------------------------------------------------------
 Thu Jan 15 16:43:01 CET 2009 - mt@suse.de
 

dhcp.spec

@@ -31,7 +31,7 @@ License:        BSD 3-Clause
 Group:          Productivity/Networking/Boot/Servers
 AutoReqProv:    on
 Version:        3.1.1
-Release:        7
+Release:        9
 Summary:        Common Files Used by ISC DHCP Software
 Url:            http://www.isc.org/isc/dhcp.html
 Source0:        http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ -490,6 +490,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %doc %{_mandir}/man3/dhcpctl.3.gz
 
 %changelog
+* Mon Jan 19 2009 mt@suse.de
+- Fixed dhclient-script to apply a dhcp provided MTU (bnc#467358).
 * Thu Jan 15 2009 mt@suse.de
 - Fix message about missed service/server association (bnc#392354).
 - Applied missed patch with support for dhcpFailOverPeer objects