Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: net/
Date: Tue, 22 Nov 2011 15:14:50
Message-Id: 76fec586336775ef8e313df3f8c3981c6b4fdfa8.WilliamH@gentoo
1 commit: 76fec586336775ef8e313df3f8c3981c6b4fdfa8
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 21 03:27:38 2011 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 22 14:50:26 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=76fec586
7
8 pass the per-interface metric to resolvconf
9
10 Reported-by: Alon Bar-Lev <alon.barlev <AT> gmail.com>
11 x-Gentoo-Bug: 364907
12 x-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?364907
13
14 ---
15 net/system.sh | 6 +++++-
16 1 files changed, 5 insertions(+), 1 deletions(-)
17
18 diff --git a/net/system.sh b/net/system.sh
19 index c451078..65557fc 100644
20 --- a/net/system.sh
21 +++ b/net/system.sh
22 @@ -46,7 +46,11 @@ _system_dns()
23
24 # Support resolvconf if we have it.
25 if [ -x /sbin/resolvconf ]; then
26 - printf "${buffer}" | resolvconf -a "${IFACE}"
27 + x="-a ${IFACE}"
28 + if [ -n "${metric_${IFVAR}}" ]; then
29 + x="${x} -m ${metric_${IFVAR}}"
30 + fi
31 + printf "${buffer}" | resolvconf ${x}
32 else
33 printf "${buffer}" > /etc/resolv.conf
34 chmod 644 /etc/resolv.conf