diff options
| author | Jonathan Bauer | 2020-08-07 14:33:25 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2020-08-07 14:33:25 +0200 |
| commit | 136de76d7ffcb02a0edc189b7f2f9ec320e64cf0 (patch) | |
| tree | 58f9f2ea1a5897cccc7632a507c7bdd41d7d5721 | |
| parent | [busybox/slx-splash] update busybox/splash (diff) | |
| download | systemd-init-136de76d7ffcb02a0edc189b7f2f9ec320e64cf0.tar.gz systemd-init-136de76d7ffcb02a0edc189b7f2f9ec320e64cf0.tar.xz systemd-init-136de76d7ffcb02a0edc189b7f2f9ec320e64cf0.zip | |
[slx-network] fix -t with busybox's timeout
| -rwxr-xr-x | modules.d/slx-network/scripts/udhcpc-trigger.stage3 | 2 | ||||
| -rwxr-xr-x | modules.d/slx-network/scripts/udhcpc-trigger.stage4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules.d/slx-network/scripts/udhcpc-trigger.stage3 b/modules.d/slx-network/scripts/udhcpc-trigger.stage3 index 27c0f22a..25d036c8 100755 --- a/modules.d/slx-network/scripts/udhcpc-trigger.stage3 +++ b/modules.d/slx-network/scripts/udhcpc-trigger.stage3 @@ -67,7 +67,7 @@ rm -f -- "/etc/resolv.conf" reverse_lookup() { [ -z "$dns" ] && return [ -z "$1" ] && return - timeout -t 3 nslookup "$1" | grep -E "^Address +[0-9]+: +$1 " | head -n 1 | awk '{print $4}' + timeout 3 nslookup "$1" | grep -E "^Address +[0-9]+: +$1 " | head -n 1 | awk '{print $4}' } echo "# From DHCP in stage 3.1" >> "$NETWORK_CONF" diff --git a/modules.d/slx-network/scripts/udhcpc-trigger.stage4 b/modules.d/slx-network/scripts/udhcpc-trigger.stage4 index d7009dc6..c2ea566a 100755 --- a/modules.d/slx-network/scripts/udhcpc-trigger.stage4 +++ b/modules.d/slx-network/scripts/udhcpc-trigger.stage4 @@ -74,7 +74,7 @@ case "$1" in fi # get domain, hostname and thus fqdn from DNS - dns_fqdn=$(busybox timeout -t 3 rdns "$ip") + dns_fqdn=$(busybox timeout 3 rdns "$ip") dns_short="${dns_fqdn%%.*}" # check if it is fqdn if [ "$dns_fqdn" == "$dns_short" ]; then |