From bfac671c1c662a8797c59c204db2d18ce021e145 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 23 Jul 2015 15:55:35 +0200 Subject: [PATCH] Revert "busybox-udhcpc simple.script: whitespace." This reverts commit ea8c1346e567ae22533a93bd2275cbdf1eeee783, to facilitate diffing. --- recipes-core/busybox/files/simple.script | 58 ++++++++++++------------ 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/recipes-core/busybox/files/simple.script b/recipes-core/busybox/files/simple.script index af0f01e..3e1eba8 100644 --- a/recipes-core/busybox/files/simple.script +++ b/recipes-core/busybox/files/simple.script @@ -31,46 +31,46 @@ case "$1" in /sbin/resolvconf -d "${interface}.udhcpc" fi if ! root_is_nfs ; then - if [ $have_bin_ip -eq 1 ]; then - ip addr flush dev $interface - ip link set dev $interface up - else - /sbin/ifconfig $interface 0.0.0.0 - fi + if [ $have_bin_ip -eq 1 ]; then + ip addr flush dev $interface + ip link set dev $interface up + else + /sbin/ifconfig $interface 0.0.0.0 + fi fi ;; renew|bound) - if [ $have_bin_ip -eq 1 ]; then - ip addr add dev $interface local $ip/$mask $BROADCAST - else - /sbin/ifconfig $interface $ip $BROADCAST $NETMASK - fi + if [ $have_bin_ip -eq 1 ]; then + ip addr add dev $interface local $ip/$mask $BROADCAST + else + /sbin/ifconfig $interface $ip $BROADCAST $NETMASK + fi if [ -n "$router" -a "$INSTALL_DEFAULT_ROUTE" != "no" ] ; then if ! root_is_nfs ; then - if [ $have_bin_ip -eq 1 ]; then - while ip route del default dev $interface 2>/dev/null ; do - : - done - else - while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do - : - done - fi + if [ $have_bin_ip -eq 1 ]; then + while ip route del default dev $interface 2>/dev/null ; do + : + done + else + while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done + fi fi metric=10 for i in $router ; do - if [ $have_bin_ip -eq 1 ]; then - ip route add default via $i metric $metric - else - route add default gw $i dev $interface metric $metric 2>/dev/null - fi - metric=$(($metric + 1)) + if [ $have_bin_ip -eq 1 ]; then + ip route add default via $i metric $metric + else + route add default gw $i dev $interface metric $metric 2>/dev/null + fi + metric=$(($metric + 1)) done fi - if [ "$STATIC_DNS" != "yes" ]; then + if [ "$STATIC_DNS" != "yes" ]; then # Update resolver configuration file R="" [ -n "$domain" ] && R="domain $domain @@ -86,10 +86,8 @@ case "$1" in else echo -n "$R" > "$RESOLV_CONF" fi - fi + fi ;; esac exit 0 - -# vim: tabstop=8 shiftwidth=8 noexpandtab