aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHagbard Celine <hagbardcelin@gmail.com>2017-11-14 11:11:32 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2017-11-14 11:11:40 -0800
commitdbfe9a7fefa70150528a66aae380b7de52d15832 (patch)
tree6acc594fe0b61cfcef0593a066065cea77571646
parentMerge pull request #26 from stkchp/master (diff)
downloadnetifrc-dbfe9a7fefa70150528a66aae380b7de52d15832.tar.gz
netifrc-dbfe9a7fefa70150528a66aae380b7de52d15832.tar.bz2
netifrc-dbfe9a7fefa70150528a66aae380b7de52d15832.zip
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 <robbat2@gentoo.org>
-rw-r--r--init.d/net.lo.in5
1 files changed, 4 insertions, 1 deletions
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)