Merge branch 'busybox' into merge

6 files changed, 12 insertions, 8 deletions

diff --git a/examples/udhcp/simple.script b/examples/udhcp/simple.script
index 44aa46ece..53974e6d6 100755
--- a/examples/udhcp/simple.script
+++ b/examples/udhcp/simple.script
@@ -55,6 +55,10 @@ case "$1" in
                 echo "Recreating $RESOLV_CONF"
                 # If the file is a symlink somewhere (like /etc/resolv.conf
                 # pointing to /run/resolv.conf), make sure things work.
+                if test -L "$RESOLV_CONF"; then
+                        # If it's a dangling symlink, try to create the target.
+                        test -e "$RESOLV_CONF" || touch "$RESOLV_CONF"
+                fi
                 realconf=$(readlink -f "$RESOLV_CONF" 2>/dev/null || echo "$RESOLV_CONF")
                 tmpfile="$realconf-$$"
                 > "$tmpfile"
diff --git a/examples/var_service/dhcp_if/run b/examples/var_service/dhcp_if/run
index aec79e027..d8f343586 100755
--- a/examples/var_service/dhcp_if/run
+++ b/examples/var_service/dhcp_if/run
@@ -8,9 +8,9 @@ pwd="$PWD"
 if="${PWD##*/dhcp_}"
 
 echo "* Upping iface $if"
-ip link set dev "$if" up
+ip link set dev "$if" up || { sleep 5; exit; }
 
-echo "* Starting udhcpc"
+echo "* Starting udhcpc on $if [$$]"
 exec \
 env - PATH="$PATH" \
 softlimit \
diff --git a/examples/var_service/dhcpd_if/run b/examples/var_service/dhcpd_if/run
index a603bdc71..e3d1b00f4 100755
--- a/examples/var_service/dhcpd_if/run
+++ b/examples/var_service/dhcpd_if/run
@@ -8,12 +8,12 @@ pwd="$PWD"
 if="${PWD##*/dhcpd_}"
 
 echo "* Upping iface $if"
-ip link set dev $if up
+ip link set dev $if up || { sleep 5; exit; }
 
 >>udhcpd.leases
 sed 's/^interface.*$/interface '"$if/" -i udhcpd.conf
 
-echo "* Starting udhcpd"
+echo "* Starting udhcpd on $if [$$]"
 exec \
 env - PATH="$PATH" \
 softlimit \
diff --git a/examples/var_service/ifplugd_if/run b/examples/var_service/ifplugd_if/run
index 5c662f298..e7816619d 100755
--- a/examples/var_service/ifplugd_if/run
+++ b/examples/var_service/ifplugd_if/run
@@ -9,7 +9,7 @@ pwd="$PWD"
 if="${PWD##*/ifplugd_}"
 
 echo "* Upping iface $if"
-ip link set dev "$if" up
+ip link set dev "$if" up || { sleep 5; exit; }
 
 echo "* Starting ifplugd on $if [$$]"
 exec \
diff --git a/examples/var_service/supplicant_if/run b/examples/var_service/supplicant_if/run
index 279d18af5..bc16fb606 100755
--- a/examples/var_service/supplicant_if/run
+++ b/examples/var_service/supplicant_if/run
@@ -14,7 +14,7 @@ ip link set dev "$if" up || { sleep 5; exit; }
 ##echo "* Powersave disable on $if"
 ##iw dev "$if" set power_save off
 
-echo "* Starting wpa_supplicant"
+echo "* Starting wpa_supplicant on $if [$$]"
 exec \
 env - PATH="$PATH" \
 softlimit \
diff --git a/examples/var_service/zcip_if/run b/examples/var_service/zcip_if/run
index 94a875465..699823246 100755
--- a/examples/var_service/zcip_if/run
+++ b/examples/var_service/zcip_if/run
@@ -8,9 +8,9 @@ pwd="$PWD"
 if="${PWD##*/zcip_}"
 
 echo "* Upping iface $if"
-ip link set dev "$if" up
+ip link set dev "$if" up || { sleep 5; exit; }
 
-echo "* Starting zcip"
+echo "* Starting zcip on $if [$$]"
 exec \
 env - PATH="$PATH" \
 softlimit \