aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox-initscripts
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-06-16 15:07:35 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-06-16 15:14:07 +0000
commit9e38486094b25e9577a6076530b4b293a3efb020 (patch)
tree9a9a9f427b577ac0c9b40a17ef2e46abcd5e8984 /main/busybox-initscripts
parent4daf0c5154069e1ddca470d41106dffc705ed2e0 (diff)
downloadaports-9e38486094b25e9577a6076530b4b293a3efb020.tar.bz2
aports-9e38486094b25e9577a6076530b4b293a3efb020.tar.xz
main/busybox-initscripts: support for disable gateway and dns in udhcpcd
ref #5672
Diffstat (limited to 'main/busybox-initscripts')
-rw-r--r--main/busybox-initscripts/APKBUILD8
-rw-r--r--main/busybox-initscripts/default.script6
2 files changed, 10 insertions, 4 deletions
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index b3f9c10dc0..c4595c562a 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=3.0
-pkgrel=0
+pkgrel=1
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
-e2d8c224cf7a300ea826bfb40e25db54 default.script"
+1461bc928901563bf449a12ece74ec40 default.script"
sha256sums="c92c6f91d56de0e7ac7189a85c6bb0f054199acc2b18258f4c7e0939d352b8b0 acpid.initd
182bddd5097daf3995c4eceec38cf9ab758f271b3e65d6b0f8a67f1281c8de19 crond.initd
26b7af7288089e8462db062c0644c8a66855d6bd0eaa7edd2a3a43b3655c7da8 dnsd.initd
@@ -100,7 +100,7 @@ ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e201419b08c4e71de dvbdev
dcb0c37590019bccb4c31a5372cbf7728eae6f1174d56bf0708d7504243a5fbb usbdev
4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 usbdisk_link
86ed99205050a5dcca8a27c7e8658df8c55dc85ed810db0d64b51f7c63aa140e xvd_links
-f81b6a0f04cecd131f6372ce27fdb7d2bbb9155ce2cc333c8374dfd70537b901 default.script"
+c38da776e379888631088451aea501424430d2625d75e62ef4cfaca0a370d8b5 default.script"
sha512sums="dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed acpid.initd
c9d0fb0f8cc27d661d3b4e58c56eb598ca368890576e18ffffd42efdf68ba35537656be9be319b2e2818aa0152d3ca8611bece2433512fbfcd4eed7988765549 crond.initd
82c70082fa6e00c389982e16b0ef92f8f137941517a2b74de57150f4645d8b8b2a91abaa22d5aede8f7d08e0749ef14a07860cf16f96058b96f4246a6c39222a dnsd.initd
@@ -125,4 +125,4 @@ ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d
b2dcf0ded9264334d79fbbb05dd12d649dc3119a060db5893f0e8aeca2141323961c3ba4c822a0ffb00dba848742d5cb374dc77e776b57cecde352a3e8e30f8a usbdev
392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 usbdisk_link
5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118 xvd_links
-b605abe0035e4ccefc6a5f6d27826caa6e62440be6add2d4140325a897d337918c79204202cc08455b7c8b122a6b744f0b6e4601a00113fd2aff4febd6f3fd90 default.script"
+11ed71b8bab30e021f7946b64a836d63007c5e6bf728784728c4e653bab728d6489e74add075995a316e58b949d7ec24c0f9df10d7edd940fe1dcc47441b3ad5 default.script"
diff --git a/main/busybox-initscripts/default.script b/main/busybox-initscripts/default.script
index fcfaa1745e..511c540bec 100644
--- a/main/busybox-initscripts/default.script
+++ b/main/busybox-initscripts/default.script
@@ -58,6 +58,9 @@ calc_metric() {
routes() {
[ -z "$router" ] && return
+ for i in $NO_GATEWAY; do
+ [ "$i" = "$interface" ] && return
+ done
local gw= num=
while ip route del default via dev $interface 2>/dev/null; do
:
@@ -77,6 +80,9 @@ resolvconf() {
|| [ -z "$RESOLV_CONF" ]; then
return
fi
+ for i in $NO_DNS; do
+ [ "$i" = "$interface" ] && return
+ done
echo -n > "$RESOLV_CONF"
[ -n "$domain" ] && echo "search $domain" >> "$RESOLV_CONF"
for i in $dns; do