diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2012-05-04 15:09:38 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-04 15:52:50 +0100 |
| commit | 3d4ccf98b83fe662f375cd5b029fdd602824c0e8 (patch) | |
| tree | 83d008f186540c6e842b6a7f121991504d120d45 /meta/recipes-core | |
| parent | 3a36efc17c8504b00a7a277a67a7b10caa4d1cdc (diff) | |
| download | openembedded-core-3d4ccf98b83fe662f375cd5b029fdd602824c0e8.tar.gz openembedded-core-3d4ccf98b83fe662f375cd5b029fdd602824c0e8.tar.bz2 openembedded-core-3d4ccf98b83fe662f375cd5b029fdd602824c0e8.zip | |
busybox: port improvements to simple.script from Debian (udhcpc)
* Support resolvconf
* Avoid bashism $((metric++))
* Use 'domain' instead of 'search' for domain parameter
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/busybox/busybox_1.19.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/files/simple.script | 27 |
2 files changed, 21 insertions, 8 deletions
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb index 0b1e78746a..a797ac9392 100644 --- a/meta/recipes-core/busybox/busybox_1.19.4.bb +++ b/meta/recipes-core/busybox/busybox_1.19.4.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r4" +PR = "r5" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://B921600.patch \ diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script index 5cc21b9de2..27368f0ee5 100644 --- a/meta/recipes-core/busybox/files/simple.script +++ b/meta/recipes-core/busybox/files/simple.script @@ -20,6 +20,9 @@ fi case "$1" in deconfig) + if [ -x /sbin/resolvconf ]; then + /sbin/resolvconf -d "${interface}.udhcpc" + fi if ! root_is_nfs ; then if [ $have_bin_ip -eq 1 ]; then ip addr flush dev $interface @@ -53,19 +56,29 @@ case "$1" in metric=0 for i in $router ; do if [ $have_bin_ip -eq 1 ]; then - ip route add default via $i metric $((metric++)) + ip route add default via $i metric $metric else - route add default gw $i dev $interface metric $((metric++)) 2>/dev/null + route add default gw $i dev $interface metric $metric 2>/dev/null fi + metric=$(($metric + 1)) done fi - echo -n > $RESOLV_CONF - [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF - for i in $dns ; do - echo adding dns $i - echo nameserver $i >> $RESOLV_CONF + # Update resolver configuration file + R="" + [ -n "$domain" ] && R="domain $domain +" + for i in $dns; do + echo "$0: Adding DNS $i" + R="${R}nameserver $i +" done + + if [ -x /sbin/resolvconf ]; then + echo -n "$R" | /sbin/resolvconf -a "${interface}.udhcpc" + else + echo -n "$R" > "$RESOLV_CONF" + fi ;; esac |