diff options
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch b/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch index 61dd6a7186..d84df5cd34 100644 --- a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch +++ b/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch | |||
@@ -8,23 +8,32 @@ Upstream-Status: Pending | |||
8 | 8 | ||
9 | Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> | 9 | Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> |
10 | 10 | ||
11 | --- dhcp-4.2.5-P1/client/scripts/linux.orig 2013-09-04 12:22:55.000000000 +0500 | 11 | Rebase to 4.3.4 |
12 | +++ dhcp-4.2.5-P1/client/scripts/linux 2013-09-04 12:52:19.068761518 +0500 | 12 | |
13 | @@ -103,17 +103,11 @@ | 13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
14 | --- | ||
15 | client/scripts/linux | 82 ++++++++++++++++++++++++++++------------------------ | ||
16 | 1 file changed, 45 insertions(+), 37 deletions(-) | ||
17 | |||
18 | diff --git a/client/scripts/linux b/client/scripts/linux | ||
19 | index a02cfd9..232a0aa 100755 | ||
20 | --- a/client/scripts/linux | ||
21 | +++ b/client/scripts/linux | ||
22 | @@ -101,17 +101,11 @@ fi | ||
14 | if [ x$old_broadcast_address != x ]; then | 23 | if [ x$old_broadcast_address != x ]; then |
15 | old_broadcast_arg="broadcast $old_broadcast_address" | 24 | old_broadcast_arg="broadcast $old_broadcast_address" |
16 | fi | 25 | fi |
17 | -if [ x$new_subnet_mask != x ]; then | 26 | -if [ x$new_subnet_mask != x ]; then |
18 | - new_subnet_arg="netmask $new_subnet_mask" | 27 | - new_subnet_arg="netmask $new_subnet_mask" |
19 | -fi | 28 | +if [ -n "$new_subnet_mask" ]; then |
29 | + new_mask="/$new_subnet_mask" | ||
30 | fi | ||
20 | -if [ x$old_subnet_mask != x ]; then | 31 | -if [ x$old_subnet_mask != x ]; then |
21 | - old_subnet_arg="netmask $old_subnet_mask" | 32 | - old_subnet_arg="netmask $old_subnet_mask" |
22 | -fi | 33 | -fi |
23 | -if [ x$alias_subnet_mask != x ]; then | 34 | -if [ x$alias_subnet_mask != x ]; then |
24 | - alias_subnet_arg="netmask $alias_subnet_mask" | 35 | - alias_subnet_arg="netmask $alias_subnet_mask" |
25 | +if [ -n "$new_subnet_mask" ]; then | 36 | -fi |
26 | + new_mask="/$new_subnet_mask" | ||
27 | fi | ||
28 | -if [ x$new_interface_mtu != x ]; then | 37 | -if [ x$new_interface_mtu != x ]; then |
29 | - mtu_arg="mtu $new_interface_mtu" | 38 | - mtu_arg="mtu $new_interface_mtu" |
30 | +if [ -n "$alias_subnet_mask" ]; then | 39 | +if [ -n "$alias_subnet_mask" ]; then |
@@ -32,7 +41,7 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> | |||
32 | fi | 41 | fi |
33 | if [ x$IF_METRIC != x ]; then | 42 | if [ x$IF_METRIC != x ]; then |
34 | metric_arg="metric $IF_METRIC" | 43 | metric_arg="metric $IF_METRIC" |
35 | @@ -127,9 +121,9 @@ | 44 | @@ -125,9 +119,9 @@ fi |
36 | if [ x$reason = xPREINIT ]; then | 45 | if [ x$reason = xPREINIT ]; then |
37 | if [ x$alias_ip_address != x ]; then | 46 | if [ x$alias_ip_address != x ]; then |
38 | # Bring down alias interface. Its routes will disappear too. | 47 | # Bring down alias interface. Its routes will disappear too. |
@@ -44,7 +53,7 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> | |||
44 | 53 | ||
45 | # We need to give the kernel some time to get the interface up. | 54 | # We need to give the kernel some time to get the interface up. |
46 | sleep 1 | 55 | sleep 1 |
47 | @@ -156,25 +150,30 @@ | 56 | @@ -154,25 +148,30 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \ |
48 | if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ | 57 | if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ |
49 | [ x$alias_ip_address != x$old_ip_address ]; then | 58 | [ x$alias_ip_address != x$old_ip_address ]; then |
50 | # Possible new alias. Remove old alias. | 59 | # Possible new alias. Remove old alias. |
@@ -81,7 +90,7 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> | |||
81 | done | 90 | done |
82 | else | 91 | else |
83 | # we haven't changed the address, have we changed other options | 92 | # we haven't changed the address, have we changed other options |
84 | @@ -182,21 +181,23 @@ | 93 | @@ -180,21 +179,23 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \ |
85 | if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then | 94 | if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then |
86 | # if we've changed routers delete the old and add the new. | 95 | # if we've changed routers delete the old and add the new. |
87 | for router in $old_routers; do | 96 | for router in $old_routers; do |
@@ -112,7 +121,7 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> | |||
112 | fi | 121 | fi |
113 | make_resolv_conf | 122 | make_resolv_conf |
114 | exit_with_hooks 0 | 123 | exit_with_hooks 0 |
115 | @@ -206,42 +207,49 @@ | 124 | @@ -204,42 +205,49 @@ if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ |
116 | || [ x$reason = xSTOP ]; then | 125 | || [ x$reason = xSTOP ]; then |
117 | if [ x$alias_ip_address != x ]; then | 126 | if [ x$alias_ip_address != x ]; then |
118 | # Turn off alias interface. | 127 | # Turn off alias interface. |
@@ -174,3 +183,6 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> | |||
174 | exit_with_hooks 1 | 183 | exit_with_hooks 1 |
175 | fi | 184 | fi |
176 | 185 | ||
186 | -- | ||
187 | 2.8.1 | ||
188 | |||