From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49A66138239 for ; Tue, 9 Jul 2019 19:59:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66B2DE0826; Tue, 9 Jul 2019 19:59:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4BEE3E0826 for ; Tue, 9 Jul 2019 19:59:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD6EB347493 for ; Tue, 9 Jul 2019 19:59:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2480DA8 for ; Tue, 9 Jul 2019 19:59:44 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1562701336.43f0190924f8c721ebccd75a2d6b99671905bedf.bkohler@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: net/ X-VCS-Repository: proj/netifrc X-VCS-Files: net/dhclient.sh net/dhcpcd.sh net/pump.sh X-VCS-Directories: net/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 43f0190924f8c721ebccd75a2d6b99671905bedf X-VCS-Branch: master Date: Tue, 9 Jul 2019 19:59:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8b396130-a165-4e13-891e-7b67227a47c9 X-Archives-Hash: 9c880cddd1482a1d7773b0b12fd488a0 commit: 43f0190924f8c721ebccd75a2d6b99671905bedf Author: Ben Kohler gentoo org> AuthorDate: Tue Jul 9 19:42:16 2019 +0000 Commit: Ben Kohler gentoo org> CommitDate: Tue Jul 9 19:42:16 2019 +0000 URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=43f01909 net/*: fix ordering of dhcp clients We want to prefer dhclient over busybox udhcpc if it's available. This commit also adds deps to the other services which will guarantee the priority dhcpcd > dhclient > pump > udhcpc. Signed-off-by: Ben Kohler gentoo.org> net/dhclient.sh | 3 +++ net/dhcpcd.sh | 4 ++-- net/pump.sh | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/net/dhclient.sh b/net/dhclient.sh index fd27308..24c3512 100644 --- a/net/dhclient.sh +++ b/net/dhclient.sh @@ -7,6 +7,9 @@ dhclient_depend() after interface program start /sbin/dhclient provide dhcp + + # We prefer dhclient over these + after udhcpc pump } _config_vars="$_config_vars dhcp dhcpcd" diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh index 1812b45..0a306b8 100644 --- a/net/dhcpcd.sh +++ b/net/dhcpcd.sh @@ -8,8 +8,8 @@ dhcpcd_depend() program start dhcpcd provide dhcp - # We prefer dhcpcd over the others - after dhclient pump udhcpc + # We prefer dhcpcd over these + after udhcpc pump dhclient } _config_vars="$_config_vars dhcp dhcpcd" diff --git a/net/pump.sh b/net/pump.sh index 270b37d..864b6cf 100644 --- a/net/pump.sh +++ b/net/pump.sh @@ -7,6 +7,9 @@ pump_depend() program /sbin/pump after interface provide dhcp + + # We prefer pump over udhcpc + after udhcpc } _config_vars="$_config_vars dhcp pump"