diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-03-26 17:57:49 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-03-26 17:57:49 +0200 |
| commit | f7ec72d86e29789c1363774aa5986b0c016599d4 (patch) | |
| tree | 7a989bbf462c9910583b4abc360d065cbed104e2 | |
| parent | cb3ef8b314ad677075a1636e26f36285feec5999 (diff) | |
| download | aports-f7ec72d86e29789c1363774aa5986b0c016599d4.tar.bz2 aports-f7ec72d86e29789c1363774aa5986b0c016599d4.tar.xz | |
main/busybox-initscripts: support 'peer-dns' in udhcpc hook
fixes #2781
| -rw-r--r-- | main/busybox-initscripts/APKBUILD | 8 | ||||
| -rw-r--r-- | main/busybox-initscripts/default.script | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD index eed19020a..cc069b117 100644 --- a/main/busybox-initscripts/APKBUILD +++ b/main/busybox-initscripts/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox-initscripts pkgver=2.2 -pkgrel=16 +pkgrel=17 pkgdesc="Init scripts for busybox daemons" url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts" arch="noarch" @@ -75,7 +75,7 @@ ad1556961294e4aa2abca6be52138b7c dvbdev daf57f3d0372f825ddc05b00973e5afe usbdev 30b0c85956b6701caf55309a17e537f6 usbdisk_link 826d85313ca7a4a0205d63bd58b7d01f xvd_links -c6470658e54f040bb85cb1fc7b56f10c default.script" +a289eb94c83d9b681967785f017c1ab9 default.script" sha256sums="894bf4edd028433bcfa5863b225387a94db477e9b4319f1655dd74907366d245 acpid.initd 9e631207340e1879318ad377b9d74ad77978c5db8bcea1bb0a4871525d67a8e7 cron.initd 5e8f251a3698700bc3cc064dd3dc85f791c6a66d32d088e107de7ac71be70697 dnsd.initd @@ -100,7 +100,7 @@ ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e201419b08c4e71de dvbdev dcb0c37590019bccb4c31a5372cbf7728eae6f1174d56bf0708d7504243a5fbb usbdev 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 usbdisk_link 86ed99205050a5dcca8a27c7e8658df8c55dc85ed810db0d64b51f7c63aa140e xvd_links -b9129dd73ffa93f9a5fa85469b9ba144cc4948b02de0bea45eee0469176cc8f8 default.script" +be6477938854793cdb38fa35a91d512d95a9d45dfc8f5b79915c30fee5145cbb default.script" sha512sums="bbd5cb45af37114a1d106e1dad6839e98c62714f94e44e480e46f7c806c6d6c434e7852980139222493fb74760f2815bbdc4bc97a683d1f3345315991056c8fa acpid.initd 44cacb40d7e732443a3bbc550b907858b404ddba928c7c30d22dfe672c36dd060b9ffa57b11584ece6a7fd5f01c056dd8b61862a2d4e0e7a47e4181784ee4af5 cron.initd 900ca3d192b3edade80b9b8b660bfe2897522ef6f36c342ea16d6f21e6d2acc609d66fc7c77133b03239f19bee2a6227851bc75279ebcab561d6784e947b6328 dnsd.initd @@ -125,4 +125,4 @@ ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d b2dcf0ded9264334d79fbbb05dd12d649dc3119a060db5893f0e8aeca2141323961c3ba4c822a0ffb00dba848742d5cb374dc77e776b57cecde352a3e8e30f8a usbdev 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 usbdisk_link 5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118 xvd_links -180fc60f235c89a377d7197fb085a2aa4b3ca1a8f559c89909e4cf08526205eb1de2256fd9e2b67093bbf202364500b638cc1aafeb57bf20fa4ce4ca3d5e965f default.script" +4e49a18f0a410ceed9976ffa8aae087f2eea055f6e147ba6ba108cc7382495cffad09577070116c1d5f7f8dbac426cb8a1859ab76b623858e3f5ea14c5f3f9a4 default.script" diff --git a/main/busybox-initscripts/default.script b/main/busybox-initscripts/default.script index 1231ea9c9..b638251b5 100644 --- a/main/busybox-initscripts/default.script +++ b/main/busybox-initscripts/default.script @@ -72,6 +72,7 @@ routes() { resolvconf() { local i + [ -n "$IF_PEER_DNS" ] && [ "$IF_PEER_DNS" != "yes" ] && return if [ "$RESOLV_CONF" = "no" ] || [ "$RESOLV_CONF" = "NO" ] \ || [ -z "$RESOLV_CONF" ]; then return |