From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RSs3e-0002y1-Kr for garchives@archives.gentoo.org; Tue, 22 Nov 2011 15:14:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0A7521C01F; Tue, 22 Nov 2011 15:14:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9D44D21C01F for ; Tue, 22 Nov 2011 15:14:35 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 011C31B4012 for ; Tue, 22 Nov 2011 15:14:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5A56A80042 for ; Tue, 22 Nov 2011 15:14:34 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <76fec586336775ef8e313df3f8c3981c6b4fdfa8.WilliamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: net/ X-VCS-Repository: proj/openrc X-VCS-Files: net/system.sh X-VCS-Directories: net/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 76fec586336775ef8e313df3f8c3981c6b4fdfa8 Date: Tue, 22 Nov 2011 15:14:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 06878e84-f37f-4616-974d-a01d83e9c89c X-Archives-Hash: 499427155cfc7c2fed6d0211c569dd23 commit: 76fec586336775ef8e313df3f8c3981c6b4fdfa8 Author: William Hubbs gentoo org> AuthorDate: Mon Nov 21 03:27:38 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Nov 22 14:50:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D76fec586 pass the per-interface metric to resolvconf Reported-by: Alon Bar-Lev gmail.com> x-Gentoo-Bug: 364907 x-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?364907 --- net/system.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/net/system.sh b/net/system.sh index c451078..65557fc 100644 --- a/net/system.sh +++ b/net/system.sh @@ -46,7 +46,11 @@ _system_dns() =20 # Support resolvconf if we have it. if [ -x /sbin/resolvconf ]; then - printf "${buffer}" | resolvconf -a "${IFACE}" + x=3D"-a ${IFACE}" + if [ -n "${metric_${IFVAR}}" ]; then + x=3D"${x} -m ${metric_${IFVAR}}" + fi + printf "${buffer}" | resolvconf ${x} else printf "${buffer}" > /etc/resolv.conf chmod 644 /etc/resolv.conf