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 D4FD01396D9 for ; Tue, 14 Nov 2017 20:48:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4EDAE0EA6; Tue, 14 Nov 2017 20:48:30 +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 C4C66E0EA6 for ; Tue, 14 Nov 2017 20:48:30 +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 BE8F033C4EE for ; Tue, 14 Nov 2017 20:48:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BE0499E6 for ; Tue, 14 Nov 2017 20:48:28 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1510686700.dbfe9a7fefa70150528a66aae380b7de52d15832.robbat2@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: init.d/ X-VCS-Repository: proj/netifrc X-VCS-Files: init.d/net.lo.in X-VCS-Directories: init.d/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: dbfe9a7fefa70150528a66aae380b7de52d15832 X-VCS-Branch: master Date: Tue, 14 Nov 2017 20:48:28 +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-Archives-Salt: 6e5979f8-fd01-4002-b97c-96e1742b528f X-Archives-Hash: 2b2d3d452ade9f937837350dbd1e216a commit: dbfe9a7fefa70150528a66aae380b7de52d15832 Author: Hagbard Celine gmail com> AuthorDate: Tue Nov 14 19:11:32 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Nov 14 19:11:40 2017 +0000 URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=dbfe9a7f init.d/net.lo: per-iface moduleslist Avoid race conditions in generation of modules list (nettree), and allow per-interface custom module work more easily. Closes: https://bugs.gentoo.org/637474 Signed-off-by: Robin H. Johnson gentoo.org> init.d/net.lo.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/init.d/net.lo.in b/init.d/net.lo.in index d7108a5..33cc932 100644 --- a/init.d/net.lo.in +++ b/init.d/net.lo.in @@ -5,7 +5,6 @@ SHDIR="@LIBEXECDIR@/sh" MODULESDIR="@LIBEXECDIR@/net" -MODULESLIST="${RC_SVCDIR}/nettree" _config_vars="config metric routes" [ -z "${IN_BACKGROUND}" ] && IN_BACKGROUND="NO" @@ -26,6 +25,10 @@ else exit 1 fi +# Create per-interface nettree ordering, avoids race conditions and allows +# per-interface custom modules. +MODULESLIST="${RC_SVCDIR}/nettree$(get_interface)" + depend() { local IFACE=$(get_interface)