diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-04-06 00:53:43 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-04-06 00:53:43 +0200 |
commit | 9c192e7f946a351c811e2278bbf56b4dc6a4b663 (patch) | |
tree | f5692f4976dbb828858545dc6990c70658429d37 | |
parent | 19578b4edf84927705cab33b9e3d39645461c69b (diff) | |
download | busybox-w32-9c192e7f946a351c811e2278bbf56b4dc6a4b663.tar.gz busybox-w32-9c192e7f946a351c811e2278bbf56b4dc6a4b663.tar.bz2 busybox-w32-9c192e7f946a351c811e2278bbf56b4dc6a4b663.zip |
examples: make udhcpc script handle /32 netmasks
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-x | examples/udhcp/sample.bound | 9 | ||||
-rwxr-xr-x | examples/udhcp/sample.renew | 11 | ||||
-rwxr-xr-x | examples/udhcp/simple.script | 10 |
3 files changed, 25 insertions, 5 deletions
diff --git a/examples/udhcp/sample.bound b/examples/udhcp/sample.bound index 7c9d857e0..efd98cf15 100755 --- a/examples/udhcp/sample.bound +++ b/examples/udhcp/sample.bound | |||
@@ -18,11 +18,18 @@ then | |||
18 | metric=0 | 18 | metric=0 |
19 | for i in $router | 19 | for i in $router |
20 | do | 20 | do |
21 | if [ "$subnet" = "255.255.255.255" ]; then | ||
22 | # special case for /32 subnets: | ||
23 | # /32 instructs kernel to always use routing for all outgoing packets | ||
24 | # (they can never be sent to local subnet - there is no local subnet for /32). | ||
25 | # Used in datacenters, avoids the need for private ip-addresses between two hops. | ||
26 | /sbin/ip route add $i dev $interface | ||
27 | fi | ||
21 | /sbin/route add default gw $i dev $interface metric $((metric++)) | 28 | /sbin/route add default gw $i dev $interface metric $((metric++)) |
22 | done | 29 | done |
23 | fi | 30 | fi |
24 | 31 | ||
25 | # Only replace resolv.conf is we have at least one DNS server | 32 | # Only replace resolv.conf if we have at least one DNS server |
26 | if [ -n "$dns" ] | 33 | if [ -n "$dns" ] |
27 | then | 34 | then |
28 | echo -n > $RESOLV_CONF | 35 | echo -n > $RESOLV_CONF |
diff --git a/examples/udhcp/sample.renew b/examples/udhcp/sample.renew index 4dce8486a..efd98cf15 100755 --- a/examples/udhcp/sample.renew +++ b/examples/udhcp/sample.renew | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # Sample udhcpc bound script | 2 | # Sample udhcpc renew script |
3 | 3 | ||
4 | RESOLV_CONF="/etc/udhcpc/resolv.conf" | 4 | RESOLV_CONF="/etc/udhcpc/resolv.conf" |
5 | 5 | ||
@@ -18,11 +18,18 @@ then | |||
18 | metric=0 | 18 | metric=0 |
19 | for i in $router | 19 | for i in $router |
20 | do | 20 | do |
21 | if [ "$subnet" = "255.255.255.255" ]; then | ||
22 | # special case for /32 subnets: | ||
23 | # /32 instructs kernel to always use routing for all outgoing packets | ||
24 | # (they can never be sent to local subnet - there is no local subnet for /32). | ||
25 | # Used in datacenters, avoids the need for private ip-addresses between two hops. | ||
26 | /sbin/ip route add $i dev $interface | ||
27 | fi | ||
21 | /sbin/route add default gw $i dev $interface metric $((metric++)) | 28 | /sbin/route add default gw $i dev $interface metric $((metric++)) |
22 | done | 29 | done |
23 | fi | 30 | fi |
24 | 31 | ||
25 | # Only replace resolv.conf is we have at least one DNS server | 32 | # Only replace resolv.conf if we have at least one DNS server |
26 | if [ -n "$dns" ] | 33 | if [ -n "$dns" ] |
27 | then | 34 | then |
28 | echo -n > $RESOLV_CONF | 35 | echo -n > $RESOLV_CONF |
diff --git a/examples/udhcp/simple.script b/examples/udhcp/simple.script index 2a917eb6c..e4c1f2d76 100755 --- a/examples/udhcp/simple.script +++ b/examples/udhcp/simple.script | |||
@@ -29,8 +29,14 @@ case "$1" in | |||
29 | metric=0 | 29 | metric=0 |
30 | for i in $router ; do | 30 | for i in $router ; do |
31 | echo "Adding router $i" | 31 | echo "Adding router $i" |
32 | route add default gw $i dev $interface metric $metric | 32 | if [ "$subnet" = "255.255.255.255" ]; then |
33 | : $(( metric += 1 )) | 33 | # special case for /32 subnets: |
34 | # /32 instructs kernel to always use routing for all outgoing packets | ||
35 | # (they can never be sent to local subnet - there is no local subnet for /32). | ||
36 | # Used in datacenters, avoids the need for private ip-addresses between two hops. | ||
37 | ip route add $i dev $interface | ||
38 | fi | ||
39 | route add default gw $i dev $interface metric $((metric++)) | ||
34 | done | 40 | done |
35 | fi | 41 | fi |
36 | 42 | ||