From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 12 Mar 2008 21:53:06 +0000 (+0000)
Subject: - updated
X-Git-Tag: DEVEL~4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdhcp.git;a=commitdiff_plain;h=f1ddf01f344144b1ad5527b431978f90d5bb58fc

- updated

Changed files:
    dhcp-dhclient.script.patch -> 1.4
---

diff --git a/dhcp-dhclient.script.patch b/dhcp-dhclient.script.patch
index 2974255..0e3b601 100644
--- a/dhcp-dhclient.script.patch
+++ b/dhcp-dhclient.script.patch
@@ -1,6 +1,7 @@
---- dhcp-3.1.0a3/client/scripts/linux.orig	2006-07-22 04:24:16.000000000 +0200
-+++ dhcp-3.1.0a3/client/scripts/linux	2007-04-16 17:25:06.000000000 +0200
-@@ -1,290 +1,302 @@
+diff -urN dhcp-4.1.0a1.org/client/scripts/linux dhcp-4.1.0a1/client/scripts/linux
+--- dhcp-4.1.0a1.org/client/scripts/linux	2008-01-17 00:02:10.000000000 +0100
++++ dhcp-4.1.0a1/client/scripts/linux	2008-03-12 22:39:33.024221732 +0100
+@@ -1,296 +1,308 @@
 -#!/bin/bash
 +#!/bin/sh
  # dhclient-script for Linux. Dan Halbert, March, 1997.
@@ -238,6 +239,9 @@
 -      route add -net $new_network_number $new_subnet_arg dev $interface
 -    fi
 -    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
 -      route add default gw $router
 -    done
 -  fi
@@ -288,6 +292,9 @@
 -      route add -net $new_network_number
 -    fi
 -    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
 -      route add default gw $router
 -    done
 -    make_resolv_conf
@@ -372,6 +379,9 @@
 +		/sbin/ip addr add $new_ip_address/$new_subnet_arg $new_broadcast_arg dev $interface
 +		# Add a network route to the computed network address.
 +		for router in $new_routers; do
++			if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
++				/sbin/ip route add $router dev $interface
++			fi
 +			/sbin/ip route add default via $router
 +		done
 +		if [ -n "$new_static_routes" ]; then
@@ -424,6 +434,9 @@
 +			/sbin/ip addr add $alias_ip_address/$alias_subnet_arg dev $interface
 +		fi
 +		for router in $new_routers; do
++			if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
++				/sbin/ip route add $router dev $interface
++			fi
 +			/sbin/ip route add default via $router
 +		done
 +		if [ -n "$new_static_routes" ]; then