diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-12-06 16:57:29 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-12-06 17:13:04 +0200 |
| commit | 760edb309d597433280a18864731bbe0ac7fdc8d (patch) | |
| tree | 5f1f69c17bb588c991de53b2b3d185b27038d064 | |
| parent | babe84f2a2a78956ab21e476f8a44cf450935046 (diff) | |
| download | alpine_aports-760edb309d597433280a18864731bbe0ac7fdc8d.tar.bz2 alpine_aports-760edb309d597433280a18864731bbe0ac7fdc8d.tar.xz alpine_aports-760edb309d597433280a18864731bbe0ac7fdc8d.zip | |
main/busybox: do not hang on DAD failure
| -rw-r--r-- | main/busybox/APKBUILD | 4 | ||||
| -rw-r--r-- | main/busybox/dad.if-up | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index ea8e17c543..7109848db6 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 3 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
| 4 | pkgname=busybox | 4 | pkgname=busybox |
| 5 | pkgver=1.28.4 | 5 | pkgver=1.28.4 |
| 6 | pkgrel=1 | 6 | pkgrel=2 |
| 7 | pkgdesc="Size optimized toolbox of many common UNIX utilities" | 7 | pkgdesc="Size optimized toolbox of many common UNIX utilities" |
| 8 | url=http://busybox.net | 8 | url=http://busybox.net |
| 9 | arch="all" | 9 | arch="all" |
| @@ -226,6 +226,6 @@ a9b1403c844c51934637215307dd9e2adb9458921047acff0d86dcf229b6e0027f4b2c6cdaa25a58 | |||
| 226 | d65dc165488a179ab19482ad74e350df9dfdccf2363b26424d2d145e27ab0819cd0cfdfb79b4a2bd0bd7c6eda3b95ea61f3c264357986e78c4675df94d487aec busyboxconfig | 226 | d65dc165488a179ab19482ad74e350df9dfdccf2363b26424d2d145e27ab0819cd0cfdfb79b4a2bd0bd7c6eda3b95ea61f3c264357986e78c4675df94d487aec busyboxconfig |
| 227 | 0efbe22e2fd56993d92b6542d4ccffb2b42d50495be085c98f417a71f503b4071e2f092afcec77f78064d33ffb0922c28daa3cb9958e6d7fb26d5a660abd90f4 busyboxconfig-extras | 227 | 0efbe22e2fd56993d92b6542d4ccffb2b42d50495be085c98f417a71f503b4071e2f092afcec77f78064d33ffb0922c28daa3cb9958e6d7fb26d5a660abd90f4 busyboxconfig-extras |
| 228 | 0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c | 228 | 0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c |
| 229 | a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02 dad.if-up | 229 | b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up |
| 230 | 061f7417c1cbf0424a5fab77e2f5912aa1593f39b33ea294af4c03518ca712d793a77ea82ff1f36e9cb98751d9faacb9d0240cdf0894efd8f26c13c28a692404 nologin.c | 230 | 061f7417c1cbf0424a5fab77e2f5912aa1593f39b33ea294af4c03518ca712d793a77ea82ff1f36e9cb98751d9faacb9d0240cdf0894efd8f26c13c28a692404 nologin.c |
| 231 | d7e1409a7beba30bb8f30a04d2ef1aad6461c19d5ab3a09514e3698fe86c247c4cc10d4d94b85c1608e6401374964b705fa6982b3f7a2b2acc2d6f14ba91806d ssl_client.c" | 231 | d7e1409a7beba30bb8f30a04d2ef1aad6461c19d5ab3a09514e3698fe86c247c4cc10d4d94b85c1608e6401374964b705fa6982b3f7a2b2acc2d6f14ba91806d ssl_client.c" |
diff --git a/main/busybox/dad.if-up b/main/busybox/dad.if-up index e76bb60bfa..98841da7c0 100644 --- a/main/busybox/dad.if-up +++ b/main/busybox/dad.if-up | |||
| @@ -1,8 +1,12 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | 2 | ||
| 3 | # Block ifup until DAD completion | 3 | # Block ifup until DAD completion |
| 4 | # Copyright (c) 2016 Kaarle Ritvanen | 4 | # Copyright (c) 2016-2018 Kaarle Ritvanen |
| 5 | 5 | ||
| 6 | while ip address show dev $IFACE | grep -q " tentative "; do | 6 | has_flag() { |
| 7 | ip address show dev $IFACE | grep -q " $1 " | ||
| 8 | } | ||
| 9 | |||
| 10 | while has_flag tentative && ! has_flag dadfailed; do | ||
| 7 | sleep 0.2 | 11 | sleep 0.2 |
| 8 | done | 12 | done |