aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-12-06 16:57:29 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-12-06 16:58:44 +0200
commit211a6eb9128981e6ba6c9121781ff2fab6d87d1c (patch)
treef83bede538f38e5cd8289dc2ec44140237ec4d2f
parent13ecc03954dea8dbc1cb1605cb84d1672eef88af (diff)
downloadaports-211a6eb9128981e6ba6c9121781ff2fab6d87d1c.tar.bz2
main/busybox: do not hang on DAD failure
-rw-r--r--main/busybox/APKBUILD4
-rw-r--r--main/busybox/dad.if-up8
2 files changed, 8 insertions, 4 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index c43dbb0..faa9932 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.29.3
-pkgrel=3
+pkgrel=4
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
arch="all"
@@ -212,6 +212,6 @@ aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f03
8fc1b81f39cb73430ebc9bca8706a71ae82b51efd2fee8ac15b4abe9b0899239075a46234cb7eae58f906c7499d1f75d11b29bcb9ca8dada8b34822df0948e73 busyboxconfig
1dc5c94708fc4d4129015c0cdd64fbe0edd2794bb10422ac2686db8a4ef06182d306ec89560d0310190c1ed86b8422c13594d2cc2b9281c8895145d5a233cc0c busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
-a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02 dad.if-up
+b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
061f7417c1cbf0424a5fab77e2f5912aa1593f39b33ea294af4c03518ca712d793a77ea82ff1f36e9cb98751d9faacb9d0240cdf0894efd8f26c13c28a692404 nologin.c
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c"
diff --git a/main/busybox/dad.if-up b/main/busybox/dad.if-up
index e76bb60..98841da 100644
--- a/main/busybox/dad.if-up
+++ b/main/busybox/dad.if-up
@@ -1,8 +1,12 @@
#!/bin/sh
# Block ifup until DAD completion
-# Copyright (c) 2016 Kaarle Ritvanen
+# Copyright (c) 2016-2018 Kaarle Ritvanen
-while ip address show dev $IFACE | grep -q " tentative "; do
+has_flag() {
+ ip address show dev $IFACE | grep -q " $1 "
+}
+
+while has_flag tentative && ! has_flag dadfailed; do
sleep 0.2
done