Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/netifrc:master commit in: init.d/
Date: Tue, 14 Nov 2017 20:48:31
Message-Id: 1510686700.dbfe9a7fefa70150528a66aae380b7de52d15832.robbat2@OpenRC
1 commit: dbfe9a7fefa70150528a66aae380b7de52d15832
2 Author: Hagbard Celine <hagbardcelin <AT> gmail <DOT> com>
3 AuthorDate: Tue Nov 14 19:11:32 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 14 19:11:40 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=dbfe9a7f
7
8 init.d/net.lo: per-iface moduleslist
9
10 Avoid race conditions in generation of modules list (nettree), and allow
11 per-interface custom module work more easily.
12
13 Closes: https://bugs.gentoo.org/637474
14 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
15
16 init.d/net.lo.in | 5 ++++-
17 1 file changed, 4 insertions(+), 1 deletion(-)
18
19 diff --git a/init.d/net.lo.in b/init.d/net.lo.in
20 index d7108a5..33cc932 100644
21 --- a/init.d/net.lo.in
22 +++ b/init.d/net.lo.in
23 @@ -5,7 +5,6 @@
24
25 SHDIR="@LIBEXECDIR@/sh"
26 MODULESDIR="@LIBEXECDIR@/net"
27 -MODULESLIST="${RC_SVCDIR}/nettree"
28 _config_vars="config metric routes"
29
30 [ -z "${IN_BACKGROUND}" ] && IN_BACKGROUND="NO"
31 @@ -26,6 +25,10 @@ else
32 exit 1
33 fi
34
35 +# Create per-interface nettree ordering, avoids race conditions and allows
36 +# per-interface custom modules.
37 +MODULESLIST="${RC_SVCDIR}/nettree$(get_interface)"
38 +
39 depend()
40 {
41 local IFACE=$(get_interface)